The patch titled spi: S3C2410: add bus number to SPI GPIO driver has been added to the -mm tree. Its filename is s3c2410-add-bus-number-to-spi-gpio-driver.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: spi: S3C2410: add bus number to SPI GPIO driver From: David Brownell <david-b@xxxxxxxxxxx> Allow passing a bus number through the platform data for the S3C2410 SPI GPIO driver Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx> Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_s3c24xx_gpio.c | 1 + include/asm-arm/arch-s3c2410/spi-gpio.h | 2 ++ 2 files changed, 3 insertions(+) diff -puN drivers/spi/spi_s3c24xx_gpio.c~s3c2410-add-bus-number-to-spi-gpio-driver drivers/spi/spi_s3c24xx_gpio.c --- a/drivers/spi/spi_s3c24xx_gpio.c~s3c2410-add-bus-number-to-spi-gpio-driver +++ a/drivers/spi/spi_s3c24xx_gpio.c @@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct /* 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 -puN include/asm-arm/arch-s3c2410/spi-gpio.h~s3c2410-add-bus-number-to-spi-gpio-driver include/asm-arm/arch-s3c2410/spi-gpio.h --- a/include/asm-arm/arch-s3c2410/spi-gpio.h~s3c2410-add-bus-number-to-spi-gpio-driver +++ a/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; _ Patches currently in -mm which might be from david-b@xxxxxxxxxxx are atmel_spi-labels-gpios-better.patch rtc-dont-write-rtc-century-when-setting-a-wake-alarm.patch git-mmc.patch usb-s3c2410_udc-minor-irq-handler-cleanups.patch usb-device-dma-support-on-omap2.patch rtc-convert-mutex-to-bitfield.patch drivers-pmc-msp71xx-gpio-char-driver.patch remove-pointless-casts-from-void-pointers.patch spi-at25-driver-is-for-eeprom-not-flash.patch spi-use-mutex-not-semaphore.patch blackfin-spi-driver-use-cpu_relax-to-replace-continue-in-while-busywait.patch blackfin-spi-driver-use-void-__iomem-for-regs_base.patch blackfin-spi-driver-move-hard-coded-pin_req-to-board-file.patch blackfin-spi-driver-reconfigure-speed_hz-and-bits_per_word-in-each-spi-transfer.patch s3c2410-add-bus-number-to-spi-gpio-driver.patch cosmetic-fixes-to-rtc-subsystems-kconfig.patch rtc-pcf8583-dont-abuse-i2c_m_nostart.patch rtc-s3c-use-is_power_of_2-macro-for-simplicity.patch rtc-cmos-exports-nvram-in-sysfs.patch generic-gpio-gpio_chip-support.patch generic-gpio-gpio_chip-support-fix.patch avr32-uses-gpio_chip.patch mcp23s08-spi-gpio-expander.patch mcp23s08-spi-gpio-expander-checkpatch-fixes.patch pnp-request-ioport-and-iomem-resources-used-by-active-devices.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html