diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-04-19 11:29:48 (GMT) |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-04 12:04:15 (GMT) |
| commit | 47f902899fc81886da88b078d74aec17b0040487 (patch) | |
| tree | f3d2d5237fc7fd32524d62eca0b12a4b6a3ff2c8 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | a4bb48874ed7bc2d27b5ec12082894226db9aa11 (diff) | |
| download | linux-fsl-qoriq-47f902899fc81886da88b078d74aec17b0040487.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 8350635..397e73c 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 */ |