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>
This commit is contained in:
Laurent Pinchart 2013-04-19 13:29:48 +02:00 committed by Simon Horman
parent a4bb48874e
commit 47f902899f
1 changed files with 4 additions and 2 deletions

View File

@ -1387,6 +1387,9 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = {
/* ST1232 */ /* ST1232 */
PIN_MAP_MUX_GROUP_DEFAULT("0-0055", "pfc-sh7372", PIN_MAP_MUX_GROUP_DEFAULT("0-0055", "pfc-sh7372",
"intc_irq7_0", "intc"), "intc_irq7_0", "intc"),
/* TCA6416 */
PIN_MAP_MUX_GROUP_DEFAULT("0-0020", "pfc-sh7372",
"intc_irq9_0", "intc"),
}; };
#define GPIO_PORT9CR IOMEM(0xE6051009) #define GPIO_PORT9CR IOMEM(0xE6051009)
@ -1464,8 +1467,7 @@ static void __init mackerel_init(void)
clk_put(clk); clk_put(clk);
} }
/* enable Keypad */ /* Keypad */
gpio_request(GPIO_FN_IRQ9_42, NULL);
irq_set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH); irq_set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH);
/* Touchscreen */ /* Touchscreen */