projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic...
[cascardo/linux.git]
/
drivers
/
spi
/
spi-fsl-dspi.c
diff --git
a/drivers/spi/spi-fsl-dspi.c
b/drivers/spi/spi-fsl-dspi.c
index
8641b03
..
ec79f72
100644
(file)
--- 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)
switch (value) {
case BITBANG_CS_ACTIVE:
pushr |= SPI_PUSHR_CONT;
switch (value) {
case BITBANG_CS_ACTIVE:
pushr |= SPI_PUSHR_CONT;
+ break;
case BITBANG_CS_INACTIVE:
pushr &= ~SPI_PUSHR_CONT;
case BITBANG_CS_INACTIVE:
pushr &= ~SPI_PUSHR_CONT;
+ break;
}
writel(pushr, dspi->base + SPI_PUSHR);
}
writel(pushr, dspi->base + SPI_PUSHR);
@@
-373,9
+375,6
@@
static int dspi_setup(struct spi_device *spi)
if (!spi->max_speed_hz)
return -EINVAL;
if (!spi->max_speed_hz)
return -EINVAL;
- if (!spi->bits_per_word)
- spi->bits_per_word = 8;
-
return dspi_setup_transfer(spi, NULL);
}
return dspi_setup_transfer(spi, NULL);
}