| From 87698f9c46d9095ce727a5f9a3782a52513680ea 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: ap4evb: 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 5436c2b9b48992349a1fb26dfd72a08c984ccba8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-ap4evb.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c |
| index 31639832..9ee8bcd0 100644 |
| --- a/arch/arm/mach-shmobile/board-ap4evb.c |
| +++ b/arch/arm/mach-shmobile/board-ap4evb.c |
| @@ -1136,6 +1136,11 @@ static const struct pinctrl_map ap4evb_pinctrl_map[] = { |
| "sdhi1_data4", "sdhi1"), |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh7372", |
| "sdhi1_ctrl", "sdhi1"), |
| + /* 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) |
| @@ -1168,10 +1173,6 @@ static void __init ap4evb_init(void) |
| ARRAY_SIZE(ap4evb_pinctrl_map)); |
| sh7372_pinmux_init(); |
| |
| - /* enable SMSC911X */ |
| - gpio_request(GPIO_FN_CS5A, NULL); |
| - gpio_request(GPIO_FN_IRQ6_39, NULL); |
| - |
| /* enable Debug switch (S6) */ |
| gpio_request_one(32, GPIOF_IN | GPIOF_EXPORT, NULL); |
| gpio_request_one(33, GPIOF_IN | GPIOF_EXPORT, NULL); |
| -- |
| 1.8.4.3.gca3854a |
| |
