diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 21:27:12 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 21:27:12 +0400 |
commit | 9d265649a86c6c0e4bae164a4c5ce806f0f12fc8 (patch) | |
tree | a782d3ffe0a171e540fdda19764ab81e11cb1a4c /drivers/spi/spi-nuc900.c | |
parent | 6d36b6f313738e99fc8b903697f8ecf06add29aa (diff) | |
parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
download | linux-9d265649a86c6c0e4bae164a4c5ce806f0f12fc8.tar.xz |
Merge 3.14-rc3 into usb-next
We want the fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi-nuc900.c')
-rw-r--r-- | drivers/spi/spi-nuc900.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c index 50406306bc20..bae97ffec4b9 100644 --- a/drivers/spi/spi-nuc900.c +++ b/drivers/spi/spi-nuc900.c @@ -361,6 +361,8 @@ static int nuc900_spi_probe(struct platform_device *pdev) init_completion(&hw->done); master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; + if (hw->pdata->lsb) + master->mode_bits |= SPI_LSB_FIRST; master->num_chipselect = hw->pdata->num_cs; master->bus_num = hw->pdata->bus_num; hw->bitbang.master = hw->master; |