diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-04-19 13:29:48 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-04 21:04:14 +0900 |
| commit | 98f2d3645f8c32a35ed7f51639172a1bad1c0dbb (patch) | |
| tree | 9c5142565143561f325dc609b79eaa7ff445b087 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | 886c5353a821b28939f095ea2394e6d471f11be0 (diff) | |
| download | op-kernel-dev-98f2d3645f8c32a35ed7f51639172a1bad1c0dbb.zip op-kernel-dev-98f2d3645f8c32a35ed7f51639172a1bad1c0dbb.tar.gz | |
ARM: shmobile: mackerel: Register pinctrl mapping for SMSC911x
Replace the GPIO-based SMSC911x 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 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 4be236d..49b66a8 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1379,6 +1379,11 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = { "sdhi2_data4", "sdhi2"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh7372", "sdhi2_ctrl", "sdhi2"), + /* SMSC911X */ + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-sh7372", + "bsc_cs5a", "bsc"), + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-sh7372", + "intc_irq6_0", "intc"), }; #define GPIO_PORT9CR IOMEM(0xE6051009) @@ -1422,10 +1427,6 @@ static void __init mackerel_init(void) ARRAY_SIZE(mackerel_pinctrl_map)); sh7372_pinmux_init(); - /* enable SMSC911X */ - gpio_request(GPIO_FN_CS5A, NULL); - gpio_request(GPIO_FN_IRQ6_39, NULL); - /* backlight, off by default */ gpio_request_one(31, GPIOF_OUT_INIT_LOW, NULL); |
