---

yaml --- r: 74355 b: refs/heads/master c: 75d4279 h: refs/heads/master i: 74353: 78327c6 74351: 438dcd5 v: v3
git-mirror · Nov 29, 2007 · 488197a · 488197a
1 parent ab0baf9
commit 488197a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 438ae1ae7bef17026127b66b1ee16efde93bbcb0
+refs/heads/master: 75d427982fef672b3608ae809b8819ec6358edfe
diff --git a/trunk/drivers/spi/spi_s3c24xx_gpio.c b/trunk/drivers/spi/spi_s3c24xx_gpio.c
@@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
 
 	/* setup spi bitbang adaptor */
 	sp->bitbang.master = spi_master_get(master);
+	sp->bitbang.master->bus_num = info->bus_num;
 	sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
 
 	sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;

diff --git a/trunk/include/asm-arm/arch-s3c2410/spi-gpio.h b/trunk/include/asm-arm/arch-s3c2410/spi-gpio.h
@@ -21,6 +21,8 @@ struct s3c2410_spigpio_info {
 	unsigned long		 pin_mosi;
 	unsigned long		 pin_miso;
 
+	int			 bus_num;
+
 	unsigned long		 board_size;
 	struct spi_board_info	*board_info;