| From 6f7c2bb37dbf8cb75238a972ced6fd3ff748ef4e Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 19 Apr 2013 13:29:48 +0200 |
| Subject: 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> |
| (cherry picked from commit 98f2d3645f8c32a35ed7f51639172a1bad1c0dbb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-mackerel.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index 4be236d1..49b66a85 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); |
| |
| -- |
| 1.8.4.3.gca3854a |
| |
