diff options
author | David Brownell <david-b@pacbell.net> | 2007-07-17 07:04:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:04 -0400 |
commit | dccd573bb02aa011a4a7146c02c409ac0bd722a0 (patch) | |
tree | 743eeca4fbbea8272ca4f341b806d776e404d704 /drivers/spi/pxa2xx_spi.c | |
parent | ff294cba8a62fa8334b88692da6d48683900f015 (diff) |
SPI controller drivers: check for unsupported modes
Minor SPI controller driver updates: make the setup() methods reject
spi->mode bits they don't support, by masking aginst the inverse of bits
they *do* support. This insures against misbehavior later when new mode
bits get added.
Most controllers can't support SPI_LSB_FIRST; more handle SPI_CS_HIGH.
Support for all four SPI clock/transfer modes is routine.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
-rw-r--r-- | drivers/spi/pxa2xx_spi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 9f2c887ffa04..e51311b2da0b 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -1067,6 +1067,9 @@ static int transfer(struct spi_device *spi, struct spi_message *msg) | |||
1067 | return 0; | 1067 | return 0; |
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | /* the spi->mode bits understood by this driver: */ | ||
1071 | #define MODEBITS (SPI_CPOL | SPI_CPHA) | ||
1072 | |||
1070 | static int setup(struct spi_device *spi) | 1073 | static int setup(struct spi_device *spi) |
1071 | { | 1074 | { |
1072 | struct pxa2xx_spi_chip *chip_info = NULL; | 1075 | struct pxa2xx_spi_chip *chip_info = NULL; |
@@ -1093,6 +1096,12 @@ static int setup(struct spi_device *spi) | |||
1093 | return -EINVAL; | 1096 | return -EINVAL; |
1094 | } | 1097 | } |
1095 | 1098 | ||
1099 | if (spi->mode & ~MODEBITS) { | ||
1100 | dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n", | ||
1101 | spi->mode & ~MODEBITS); | ||
1102 | return -EINVAL; | ||
1103 | } | ||
1104 | |||
1096 | /* Only alloc on first setup */ | 1105 | /* Only alloc on first setup */ |
1097 | chip = spi_get_ctldata(spi); | 1106 | chip = spi_get_ctldata(spi); |
1098 | if (!chip) { | 1107 | if (!chip) { |