From 488197af630835fe7458e46f68421c0343ad7e6d Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 28 Nov 2007 16:21:30 -0800 Subject: [PATCH] --- yaml --- r: 74355 b: refs/heads/master c: 75d427982fef672b3608ae809b8819ec6358edfe h: refs/heads/master i: 74353: 78327c6d21540fcc0ea19e135c2c9fa104613bfe 74351: 438dcd5aa3c7842b671895317780f3e373843f86 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_s3c24xx_gpio.c | 1 + trunk/include/asm-arm/arch-s3c2410/spi-gpio.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ce4336f694c7..5aa5eb6a3e03 100644 --- 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 index d59105dc308b..109d82c1abc0 100644 --- 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 index c1e4db7c9710..ba1dca88d480 100644 --- 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;