aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/au1550_spi.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-07-17 07:04:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:04 -0400
commitdccd573bb02aa011a4a7146c02c409ac0bd722a0 (patch)
tree743eeca4fbbea8272ca4f341b806d776e404d704 /drivers/spi/au1550_spi.c
parentff294cba8a62fa8334b88692da6d48683900f015 (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/au1550_spi.c')
-rw-r--r--drivers/spi/au1550_spi.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index ae2b1af0dba4..c47a650183a1 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -280,6 +280,9 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
280 return 0; 280 return 0;
281} 281}
282 282
283/* the spi->mode bits understood by this driver: */
284#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST)
285
283static int au1550_spi_setup(struct spi_device *spi) 286static int au1550_spi_setup(struct spi_device *spi)
284{ 287{
285 struct au1550_spi *hw = spi_master_get_devdata(spi->master); 288 struct au1550_spi *hw = spi_master_get_devdata(spi->master);
@@ -292,6 +295,12 @@ static int au1550_spi_setup(struct spi_device *spi)
292 return -EINVAL; 295 return -EINVAL;
293 } 296 }
294 297
298 if (spi->mode & ~MODEBITS) {
299 dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",
300 spi->mode & ~MODEBITS);
301 return -EINVAL;
302 }
303
295 if (spi->max_speed_hz == 0) 304 if (spi->max_speed_hz == 0)
296 spi->max_speed_hz = hw->freq_max; 305 spi->max_speed_hz = hw->freq_max;
297 if (spi->max_speed_hz > hw->freq_max 306 if (spi->max_speed_hz > hw->freq_max