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>

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 83506357479c500251cb09073b6ecd6174043988..397e73c4196927e937621564e642145d0ca3a640 100644 (file)
--- 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 */