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:14 (GMT) |
| commit | a4bb48874ed7bc2d27b5ec12082894226db9aa11 (patch) | |
| tree | 40ee19fe270290e951a2c44f456a9c1e3aeffa93 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | 98f2d3645f8c32a35ed7f51639172a1bad1c0dbb (diff) | |
| download | linux-fsl-qoriq-a4bb48874ed7bc2d27b5ec12082894226db9aa11.tar.xz | |
ARM: shmobile: mackerel: Register pinctrl mapping for ST1232
Replace the GPIO-based ST1232 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 49b66a8..8350635 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1384,6 +1384,9 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = { "bsc_cs5a", "bsc"), PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-sh7372", "intc_irq6_0", "intc"), + /* ST1232 */ + PIN_MAP_MUX_GROUP_DEFAULT("0-0055", "pfc-sh7372", + "intc_irq7_0", "intc"), }; #define GPIO_PORT9CR IOMEM(0xE6051009) @@ -1465,8 +1468,7 @@ static void __init mackerel_init(void) gpio_request(GPIO_FN_IRQ9_42, NULL); irq_set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH); - /* enable Touchscreen */ - gpio_request(GPIO_FN_IRQ7_40, NULL); + /* Touchscreen */ irq_set_irq_type(IRQ7, IRQ_TYPE_LEVEL_LOW); /* Accelerometer */ |