From: Laurent Pinchart Date: Fri, 19 Apr 2013 11:29:48 +0000 (+0200) Subject: ARM: shmobile: ap4evb: Register pinctrl mapping for SMSC911x X-Git-Tag: next-20130521~8^2~1^2~54 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7fe98d42edcd1d275fdcd9f01e0ee3b91475ade9;p=karo-tx-linux.git ARM: shmobile: ap4evb: Register pinctrl mapping for SMSC911x Replace the GPIO-based SMSC911x pinmux configuration by a pinctrl mapping. Signed-off-by: Laurent Pinchart Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 3163983289a4..9ee8bcd0d7d6 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);