| From 6e848fd16f34df458bb6bded632de900d310ddfa 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: mackerel: Register pinctrl mapping for TCA6416 |
| |
| Replace the GPIO-based TCA6416 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 47f902899fc81886da88b078d74aec17b0040487) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-mackerel.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index 83506357..397e73c4 100644 |
| --- a/arch/arm/mach-shmobile/board-mackerel.c |
| +++ b/arch/arm/mach-shmobile/board-mackerel.c |
| @@ -1387,6 +1387,9 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = { |
| /* ST1232 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("0-0055", "pfc-sh7372", |
| "intc_irq7_0", "intc"), |
| + /* TCA6416 */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("0-0020", "pfc-sh7372", |
| + "intc_irq9_0", "intc"), |
| }; |
| |
| #define GPIO_PORT9CR IOMEM(0xE6051009) |
| @@ -1464,8 +1467,7 @@ static void __init mackerel_init(void) |
| clk_put(clk); |
| } |
| |
| - /* enable Keypad */ |
| - gpio_request(GPIO_FN_IRQ9_42, NULL); |
| + /* Keypad */ |
| irq_set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH); |
| |
| /* Touchscreen */ |
| -- |
| 1.8.4.3.gca3854a |
| |
