diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-01-24 07:16:32 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-27 19:54:20 -0500 |
commit | 89aaf5c0caefdadb61da81d8c143c5c2fb4b974a (patch) | |
tree | ac3675df301dbb6a107d43ad7c68a90345dcf87c /arch/arm/mach-shmobile | |
parent | 6c52bce43697c093ea1437337148b4fb9450af07 (diff) |
ARM: shmobile: bonito: Use gpio_request_one()
Replace occurences of gpio_request() and gpio_direction_*() by calls to
gpio_request_one().
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/board-bonito.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c index cb8c994e1430..932a9c0926bc 100644 --- a/arch/arm/mach-shmobile/board-bonito.c +++ b/arch/arm/mach-shmobile/board-bonito.c | |||
@@ -392,8 +392,7 @@ static void __init bonito_init(void) | |||
392 | /* | 392 | /* |
393 | * base board settings | 393 | * base board settings |
394 | */ | 394 | */ |
395 | gpio_request(GPIO_PORT176, NULL); | 395 | gpio_request_one(GPIO_PORT176, GPIOF_IN, NULL); |
396 | gpio_direction_input(GPIO_PORT176); | ||
397 | if (!gpio_get_value(GPIO_PORT176)) { | 396 | if (!gpio_get_value(GPIO_PORT176)) { |
398 | u16 bsw2; | 397 | u16 bsw2; |
399 | u16 bsw3; | 398 | u16 bsw3; |
@@ -462,8 +461,8 @@ static void __init bonito_init(void) | |||
462 | gpio_request(GPIO_FN_LCD0_DISP, NULL); | 461 | gpio_request(GPIO_FN_LCD0_DISP, NULL); |
463 | gpio_request(GPIO_FN_LCD0_LCLK_PORT165, NULL); | 462 | gpio_request(GPIO_FN_LCD0_LCLK_PORT165, NULL); |
464 | 463 | ||
465 | gpio_request(GPIO_PORT61, NULL); /* LCDDON */ | 464 | gpio_request_one(GPIO_PORT61, GPIOF_OUT_INIT_HIGH, |
466 | gpio_direction_output(GPIO_PORT61, 1); | 465 | NULL); /* LCDDON */ |
467 | 466 | ||
468 | /* backlight on */ | 467 | /* backlight on */ |
469 | bonito_fpga_write(LCDCR, 1); | 468 | bonito_fpga_write(LCDCR, 1); |