diff options
author | David Brownell <david-b@pacbell.net> | 2006-06-28 10:47:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 18:51:01 -0400 |
commit | 980a01c9bfb090cb8a991e39e56ac379c30c61b8 (patch) | |
tree | 8d14aa685d81abe410ce1842a6498878daf8a04d | |
parent | 8f7c58814eb75bf97b8bc18d107b2e26f28b6585 (diff) |
[PATCH] SPI: infrastructure to initialize spi_device.mode early
This patch adds earlier initialization of spi_device.mode, as needed
on boards using nondefault chipselect polarity. An example would be
ones using the RS5C348 RTC without an external signal inverter between
the RTC chipselect and the SPI controller.
Without this mechanism, the first setup() call for that chip would
wrongly enable chips, corrupting transfers to/from other chips sharing
that SPI bus.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/spi/spi.c | 1 | ||||
-rw-r--r-- | include/linux/spi/spi.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 1cea4a6799fe..ed1cdf6ac8f3 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -210,6 +210,7 @@ spi_new_device(struct spi_master *master, struct spi_board_info *chip) | |||
210 | proxy->master = master; | 210 | proxy->master = master; |
211 | proxy->chip_select = chip->chip_select; | 211 | proxy->chip_select = chip->chip_select; |
212 | proxy->max_speed_hz = chip->max_speed_hz; | 212 | proxy->max_speed_hz = chip->max_speed_hz; |
213 | proxy->mode = chip->mode; | ||
213 | proxy->irq = chip->irq; | 214 | proxy->irq = chip->irq; |
214 | proxy->modalias = chip->modalias; | 215 | proxy->modalias = chip->modalias; |
215 | 216 | ||
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index e928c0dcc297..c8bb68099eb9 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
@@ -642,10 +642,14 @@ struct spi_board_info { | |||
642 | u16 bus_num; | 642 | u16 bus_num; |
643 | u16 chip_select; | 643 | u16 chip_select; |
644 | 644 | ||
645 | /* mode becomes spi_device.mode, and is essential for chips | ||
646 | * where the default of SPI_CS_HIGH = 0 is wrong. | ||
647 | */ | ||
648 | u8 mode; | ||
649 | |||
645 | /* ... may need additional spi_device chip config data here. | 650 | /* ... may need additional spi_device chip config data here. |
646 | * avoid stuff protocol drivers can set; but include stuff | 651 | * avoid stuff protocol drivers can set; but include stuff |
647 | * needed to behave without being bound to a driver: | 652 | * needed to behave without being bound to a driver: |
648 | * - chipselect polarity | ||
649 | * - quirks like clock rate mattering when not selected | 653 | * - quirks like clock rate mattering when not selected |
650 | */ | 654 | */ |
651 | }; | 655 | }; |