ARM: uniphier: drop unneeded EHCI pin mux settings

These pin mux settings are cared by the pinctrl drivers.
Remove the ad-hoc code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
index 3c06b30a9e8532253c72b297e090a6827b56fc8a..2fe2c7fc806f7d149237d75f1444c38109e8b18c 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
@@ -35,15 +35,6 @@ void ph1_ld4_pin_init(void)
        sg_set_pinsel(31, 0, 8, 4);     /* MMCDAT7 -> NFD7_GB */
 #endif
 
-#ifdef CONFIG_USB_EHCI
-       sg_set_pinsel(53, 0, 8, 4);     /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(54, 0, 8, 4);     /* USB0OD   -> USB0OD */
-       sg_set_pinsel(55, 0, 8, 4);     /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(56, 0, 8, 4);     /* USB1OD   -> USB1OD */
-       /* sg_set_pinsel(67, 23, 8, 4); */ /* PCOE -> USB2VBUS */
-       /* sg_set_pinsel(68, 23, 8, 4); */ /* PCWAIT -> USB2OD */
-#endif
-
        tmp = readl(SG_IECTRL);
        tmp |= 0x41;
        writel(tmp, SG_IECTRL);

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
index d5541a9bebcb783452c4bbda23cbc4eef5fe141a..b08ca1ef31f13f345a5687359e8dd3db19411718 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
@@ -40,12 +40,5 @@ void ph1_pro4_pin_init(void)
        sg_set_pinsel(183, 0, 4, 8);    /* USB1OD   -> USB1OD */
 #endif
 
-#ifdef CONFIG_USB_EHCI
-       sg_set_pinsel(184, 0, 4, 8);    /* USB2VBUS -> USB2VBUS */
-       sg_set_pinsel(185, 0, 4, 8);    /* USB2OD   -> USB2OD */
-       sg_set_pinsel(187, 0, 4, 8);    /* USB3VBUS -> USB3VBUS */
-       sg_set_pinsel(188, 0, 4, 8);    /* USB3OD   -> USB3OD */
-#endif
-
        writel(1, SG_LOADPINCTRL);
 }

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
index 67635844a1f777a7d898327e621588b1b956846f..f3fae1d7c6b22094085906735326670c30800e1f 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
@@ -32,13 +32,4 @@ void ph1_sld8_pin_init(void)
        sg_set_pinsel(30, 0, 8, 4);     /* NFD6_GB -> NFD6_GB */
        sg_set_pinsel(31, 0, 8, 4);     /* NFD7_GB -> NFD7_GB */
 #endif
-
-#ifdef CONFIG_USB_EHCI
-       sg_set_pinsel(41, 0, 8, 4);     /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(42, 0, 8, 4);     /* USB0OD   -> USB0OD */
-       sg_set_pinsel(43, 0, 8, 4);     /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(44, 0, 8, 4);     /* USB1OD   -> USB1OD */
-       /* sg_set_pinsel(114, 1, 8, 4); */ /* TXD1 -> USB2VBUS (shared with UART) */
-       /* sg_set_pinsel(115, 1, 8, 4); */ /* RXD1 -> USB2OD */
-#endif
 }