aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-11-28 19:21:30 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-29 12:24:52 -0500
commit75d427982fef672b3608ae809b8819ec6358edfe (patch)
treeb8b965efa555f32c9b1309e547ba0bfede3b5004
parent438ae1ae7bef17026127b66b1ee16efde93bbcb0 (diff)
spi: S3C2410: add bus number to SPI GPIO driver
Allow passing a bus number through the platform data for the S3C2410 SPI GPIO driver. This is needed to support multiple SPI busses. Signed-off-by: Ben Dooks <ben-linux@fluff.org> 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>
-rw-r--r--drivers/spi/spi_s3c24xx_gpio.c1
-rw-r--r--include/asm-arm/arch-s3c2410/spi-gpio.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index d59105dc308b..109d82c1abc0 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
118 118
119 /* setup spi bitbang adaptor */ 119 /* setup spi bitbang adaptor */
120 sp->bitbang.master = spi_master_get(master); 120 sp->bitbang.master = spi_master_get(master);
121 sp->bitbang.master->bus_num = info->bus_num;
121 sp->bitbang.chipselect = s3c2410_spigpio_chipselect; 122 sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
122 123
123 sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0; 124 sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/include/asm-arm/arch-s3c2410/spi-gpio.h
index c1e4db7c9710..ba1dca88d480 100644
--- a/include/asm-arm/arch-s3c2410/spi-gpio.h
+++ b/include/asm-arm/arch-s3c2410/spi-gpio.h
@@ -21,6 +21,8 @@ struct s3c2410_spigpio_info {
21 unsigned long pin_mosi; 21 unsigned long pin_mosi;
22 unsigned long pin_miso; 22 unsigned long pin_miso;
23 23
24 int bus_num;
25
24 unsigned long board_size; 26 unsigned long board_size;
25 struct spi_board_info *board_info; 27 struct spi_board_info *board_info;
26 28