Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 75d427982fef672b3608ae809b8819ec6358edfe

Authored by David Brownell
Committed by Linus Torvalds
1 parent 438ae1ae7b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 3 additions and 0 deletions Side-by-side Diff

drivers/spi/spi_s3c24xx_gpio.c
Diff comments   View file @ 75d4279
... ... @@ -118,6 +118,7 @@
118 118  
119 119 /* setup spi bitbang adaptor */
120 120 sp->bitbang.master = spi_master_get(master);
  121 + sp->bitbang.master->bus_num = info->bus_num;
121 122 sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
122 123  
123 124 sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
include/asm-arm/arch-s3c2410/spi-gpio.h
Diff comments   View file @ 75d4279
... ... @@ -21,6 +21,8 @@
21 21 unsigned long pin_mosi;
22 22 unsigned long pin_miso;
23 23  
  24 + int bus_num;
  25 +
24 26 unsigned long board_size;
25 27 struct spi_board_info *board_info;
26 28