diff options
Diffstat (limited to 'drivers/spi/spi-fsl-dspi.c')
-rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 8641b03bdd7a..ec79f726672a 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c | |||
@@ -320,8 +320,10 @@ static void dspi_chipselect(struct spi_device *spi, int value) | |||
320 | switch (value) { | 320 | switch (value) { |
321 | case BITBANG_CS_ACTIVE: | 321 | case BITBANG_CS_ACTIVE: |
322 | pushr |= SPI_PUSHR_CONT; | 322 | pushr |= SPI_PUSHR_CONT; |
323 | break; | ||
323 | case BITBANG_CS_INACTIVE: | 324 | case BITBANG_CS_INACTIVE: |
324 | pushr &= ~SPI_PUSHR_CONT; | 325 | pushr &= ~SPI_PUSHR_CONT; |
326 | break; | ||
325 | } | 327 | } |
326 | 328 | ||
327 | writel(pushr, dspi->base + SPI_PUSHR); | 329 | writel(pushr, dspi->base + SPI_PUSHR); |
@@ -373,9 +375,6 @@ static int dspi_setup(struct spi_device *spi) | |||
373 | if (!spi->max_speed_hz) | 375 | if (!spi->max_speed_hz) |
374 | return -EINVAL; | 376 | return -EINVAL; |
375 | 377 | ||
376 | if (!spi->bits_per_word) | ||
377 | spi->bits_per_word = 8; | ||
378 | |||
379 | return dspi_setup_transfer(spi, NULL); | 378 | return dspi_setup_transfer(spi, NULL); |
380 | } | 379 | } |
381 | 380 | ||