aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-11-28 19:21:10 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-29 12:24:51 -0500
commit65f97a56944b797f5df714d677b541cca0829669 (patch)
treee7999ac428055bbd7e6ec955735c4d3fcfbe3227 /drivers/spi
parent8905a67c63ff3facadad10aa53a8bb159f3ace7b (diff)
atmel_spi: label GPIOs better
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@users.sourceforge.net> Cc: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/atmel_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 0d342dcdd302..ff6a14bf1280 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -497,7 +497,7 @@ static int atmel_spi_setup(struct spi_device *spi)
497 /* chipselect must have been muxed as GPIO (e.g. in board setup) */ 497 /* chipselect must have been muxed as GPIO (e.g. in board setup) */
498 npcs_pin = (unsigned int)spi->controller_data; 498 npcs_pin = (unsigned int)spi->controller_data;
499 if (!spi->controller_state) { 499 if (!spi->controller_state) {
500 ret = gpio_request(npcs_pin, "spi_npcs"); 500 ret = gpio_request(npcs_pin, spi->dev.bus_id);
501 if (ret) 501 if (ret)
502 return ret; 502 return ret;
503 spi->controller_state = (void *)npcs_pin; 503 spi->controller_state = (void *)npcs_pin;