ARM: uniphier: delete unnecessary xHCI pin-mux settings

These ad-hoc pinmux settings were used for the legacy xHCI driver,
which has gone now.

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

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
index 645b90151c07e12ac1d0e99a68b38568b4c7b8a0..ec4c414c260eced089eadab7307eb81a20072f71 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
@@ -32,18 +32,6 @@ void uniphier_ld20_pin_init(void)
        sg_set_iectrl_range(3, 17);
 #endif
 
-#ifdef CONFIG_USB_XHCI_UNIPHIER
-       sg_set_pinsel(46, 0, 8, 4);     /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(47, 0, 8, 4);     /* USB0OD   -> USB0OD */
-       sg_set_pinsel(48, 0, 8, 4);     /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(49, 0, 8, 4);     /* USB1OD   -> USB1OD */
-       sg_set_pinsel(50, 0, 8, 4);     /* USB2VBUS -> USB2VBUS */
-       sg_set_pinsel(51, 0, 8, 4);     /* USB2OD   -> USB2OD */
-       sg_set_pinsel(52, 0, 8, 4);     /* USB3VBUS -> USB3VBUS */
-       sg_set_pinsel(53, 0, 8, 4);     /* USB3OD   -> USB3OD */
-       sg_set_iectrl_range(46, 53);
-#endif
-
        sg_set_pinsel(149, 14, 8, 4);   /* XIRQ0    -> XIRQ0 */
        sg_set_iectrl(149);
        sg_set_pinsel(153, 14, 8, 4);   /* XIRQ4    -> XIRQ4 */

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
index 913722b256dbad6e60faa7757ca2243dfa56d3bd..f3b711527a1e0d8abccf7ca7ea9a4ca45d47ce50 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
@@ -32,15 +32,4 @@ void uniphier_ld6b_pin_init(void)
        sg_set_pinsel(45, 0, 8, 4);     /* NFD6   -> NFD6 */
        sg_set_pinsel(46, 0, 8, 4);     /* NFD7   -> NFD7 */
 #endif
-
-#ifdef CONFIG_USB_XHCI_UNIPHIER
-       sg_set_pinsel(56, 0, 8, 4);     /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(57, 0, 8, 4);     /* USB0OD   -> USB0OD */
-       sg_set_pinsel(58, 0, 8, 4);     /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(59, 0, 8, 4);     /* USB1OD   -> USB1OD */
-       sg_set_pinsel(60, 0, 8, 4);     /* USB2VBUS -> USB2VBUS */
-       sg_set_pinsel(61, 0, 8, 4);     /* USB2OD   -> USB2OD */
-       sg_set_pinsel(62, 0, 8, 4);     /* USB3VBUS -> USB3VBUS */
-       sg_set_pinsel(63, 0, 8, 4);     /* USB3OD   -> USB3OD */
-#endif
 }

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
index 3796491c593f73700e6572db7b5ef83507a04d33..871d3ef86c1122ca8d69162bf8601afddabd9cf3 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
@@ -33,12 +33,5 @@ void uniphier_pro4_pin_init(void)
        /* sg_set_pinsel(132, 1, 4, 8); */      /* TXD2   -> XNFCE1 */
 #endif
 
-#ifdef CONFIG_USB_XHCI_UNIPHIER
-       sg_set_pinsel(180, 0, 4, 8);    /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(181, 0, 4, 8);    /* USB0OD   -> USB0OD */
-       sg_set_pinsel(182, 0, 4, 8);    /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(183, 0, 4, 8);    /* USB1OD   -> USB1OD */
-#endif
-
        writel(1, SG_LOADPINCTRL);
 }

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
index 32ba923480c33201b9ad31e331bf5d6ebb4fe8be..58dff18f431634b1ce51d48ed0413db7af3bbc49 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
@@ -33,12 +33,5 @@ void uniphier_pro5_pin_init(void)
        sg_set_pinsel(35, 0, 4, 8);     /* NFD7   -> NFD7 */
 #endif
 
-#ifdef CONFIG_USB_XHCI_UNIPHIER
-       sg_set_pinsel(124, 0, 4, 8);    /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(125, 0, 4, 8);    /* USB0OD   -> USB0OD */
-       sg_set_pinsel(126, 0, 4, 8);    /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(127, 0, 4, 8);    /* USB1OD   -> USB1OD */
-#endif
-
        writel(1, SG_LOADPINCTRL);
 }

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
index 2d62ab3d8894df36723a5edc2dac62e77688f206..fc592051675dc19063b180b1875feb1d9d984f42 100644 (file)
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
@@ -32,15 +32,4 @@ void uniphier_pxs2_pin_init(void)
        sg_set_pinsel(45, 8, 8, 4);     /* NFD6   -> NFD6 */
        sg_set_pinsel(46, 8, 8, 4);     /* NFD7   -> NFD7 */
 #endif
-
-#ifdef CONFIG_USB_XHCI_UNIPHIER
-       sg_set_pinsel(56, 8, 8, 4);     /* USB0VBUS -> USB0VBUS */
-       sg_set_pinsel(57, 8, 8, 4);     /* USB0OD   -> USB0OD */
-       sg_set_pinsel(58, 8, 8, 4);     /* USB1VBUS -> USB1VBUS */
-       sg_set_pinsel(59, 8, 8, 4);     /* USB1OD   -> USB1OD */
-       sg_set_pinsel(60, 8, 8, 4);     /* USB2VBUS -> USB2VBUS */
-       sg_set_pinsel(61, 8, 8, 4);     /* USB2OD   -> USB2OD */
-       sg_set_pinsel(62, 8, 8, 4);     /* USB3VBUS -> USB3VBUS */
-       sg_set_pinsel(63, 8, 8, 4);     /* USB3OD   -> USB3OD */
-#endif
 }