| From 014244fab67e612c267ec6dcaa8fc0c9d20593ab Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 19 Apr 2013 13:29:48 +0200 |
| Subject: ARM: shmobile: ap4evb: Register pinctrl mapping for KEYSC |
| |
| Replace the GPIO-based KEYSC pinmux configuration by a pinctrl mapping. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 6cd49f71a420cfab69e0b208052b7a39f5642262) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-ap4evb.c | 17 +++++------------ |
| 1 file changed, 5 insertions(+), 12 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c |
| index 2dfa235b..c7a9efc5 100644 |
| --- a/arch/arm/mach-shmobile/board-ap4evb.c |
| +++ b/arch/arm/mach-shmobile/board-ap4evb.c |
| @@ -1102,6 +1102,11 @@ static const struct pinctrl_map ap4evb_pinctrl_map[] = { |
| /* HDMI */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-sh7372", |
| "hdmi", "hdmi"), |
| + /* KEYSC */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc", "pfc-sh7372", |
| + "keysc_in04_0", "keysc"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc", "pfc-sh7372", |
| + "keysc_out5", "keysc"), |
| /* MMCIF */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh7372", |
| "mmc0_data8_0", "mmc0"), |
| @@ -1219,18 +1224,6 @@ static void __init ap4evb_init(void) |
| * IRQ28 for Touch Panel, set dip switches S3, S43 as OFF, ON. |
| */ |
| |
| - /* enable KEYSC */ |
| - gpio_request(GPIO_FN_KEYOUT0, NULL); |
| - gpio_request(GPIO_FN_KEYOUT1, NULL); |
| - gpio_request(GPIO_FN_KEYOUT2, NULL); |
| - gpio_request(GPIO_FN_KEYOUT3, NULL); |
| - gpio_request(GPIO_FN_KEYOUT4, NULL); |
| - gpio_request(GPIO_FN_KEYIN0_136, NULL); |
| - gpio_request(GPIO_FN_KEYIN1_135, NULL); |
| - gpio_request(GPIO_FN_KEYIN2_134, NULL); |
| - gpio_request(GPIO_FN_KEYIN3_133, NULL); |
| - gpio_request(GPIO_FN_KEYIN4, NULL); |
| - |
| /* enable TouchScreen */ |
| irq_set_irq_type(IRQ28, IRQ_TYPE_LEVEL_LOW); |
| |
| -- |
| 1.8.4.3.gca3854a |
| |
