summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorTakashi YOSHII <takashi.yoshii.zj@renesas.com>2010-12-22 06:30:19 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-12-22 16:35:54 +0900
commit5d7814728d80ee56d02e99cc2ab0850c8625a047 (patch)
tree7b9cb344afcd6151364a01123fa5fa70bc65262b /arch/arm/mach-shmobile
parenta0794fd019820d3d5e9d73ffd61b5bbcac818f18 (diff)
ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
Follow up to pfc-sh73a0.c's pull-up support. Change GPIO_FN_KEYINx to GPIO_FN_KEYINx_PU. Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@renesas.com> Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-ag5evm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 85f9269d83ca..c6b152469972 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -197,14 +197,14 @@ static void __init ag5evm_init(void)
gpio_request(GPIO_FN_SCIFA2_CTS1_, NULL);
/* enable KEYSC */
- gpio_request(GPIO_FN_KEYIN0, NULL);
- gpio_request(GPIO_FN_KEYIN1, NULL);
- gpio_request(GPIO_FN_KEYIN2, NULL);
- gpio_request(GPIO_FN_KEYIN3, NULL);
- gpio_request(GPIO_FN_KEYIN4, NULL);
- gpio_request(GPIO_FN_KEYIN5, NULL);
- gpio_request(GPIO_FN_KEYIN6, NULL);
- gpio_request(GPIO_FN_KEYIN7, NULL);
+ gpio_request(GPIO_FN_KEYIN0_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN1_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN2_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN3_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN4_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN5_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN6_PU, NULL);
+ gpio_request(GPIO_FN_KEYIN7_PU, NULL);
gpio_request(GPIO_FN_KEYOUT0, NULL);
gpio_request(GPIO_FN_KEYOUT1, NULL);
gpio_request(GPIO_FN_KEYOUT2, NULL);