The patch titled atmel_spi: label GPIOs better has been added to the -mm tree. Its filename is atmel_spi-labels-gpios-better.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: atmel_spi: label GPIOs better From: David Brownell <david-b@xxxxxxxxxxx> Make the atmel_spi driver label GPIOs according to the device for which they're acting as a chipselect. This way the debugfs dump of gpio state is more informative. Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/atmel_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/spi/atmel_spi.c~atmel_spi-labels-gpios-better drivers/spi/atmel_spi.c --- a/drivers/spi/atmel_spi.c~atmel_spi-labels-gpios-better +++ a/drivers/spi/atmel_spi.c @@ -497,7 +497,7 @@ static int atmel_spi_setup(struct spi_de /* chipselect must have been muxed as GPIO (e.g. in board setup) */ npcs_pin = (unsigned int)spi->controller_data; if (!spi->controller_state) { - ret = gpio_request(npcs_pin, "spi_npcs"); + ret = gpio_request(npcs_pin, spi->dev.bus_id); if (ret) return ret; spi->controller_state = (void *)npcs_pin; _ Patches currently in -mm which might be from david-b@xxxxxxxxxxx are origin.patch atmel_spi-labels-gpios-better.patch atmel_spi-throughput-improvement.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 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 atmel_spi-chains-dma-transfers.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