summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-02 21:11:39 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-14 16:51:07 +0900
commitcd0847fe63e5ec669a497a5cfcb85de33ce6a0d8 (patch)
tree7e6c82d703bcb2d7455e03d600d6ae5c18928c08 /arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
parent49dde45ba8dd11dfaf157394030cb7e592c01ad9 (diff)
downloadtalos-obmc-uboot-cd0847fe63e5ec669a497a5cfcb85de33ce6a0d8.tar.gz
talos-obmc-uboot-cd0847fe63e5ec669a497a5cfcb85de33ce6a0d8.zip
ARM: uniphier: switch over to generic EHCI driver
The UniPhier EHCI driver (drivers/usb/host/ehci-uniphier.c) does nothing special but set the base address and handle reset/clock. Since commit 4feefdcfe916 ("usb: add clock support for generic EHCI"), the generic one (drivers/usb/host/ehci-generic.c) can do those, too. We no longer need to stick to the dedicated driver. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c')
-rw-r--r--arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
index 8168a63d31..3c06b30a9e 100644
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
@@ -35,7 +35,7 @@ void ph1_ld4_pin_init(void)
sg_set_pinsel(31, 0, 8, 4); /* MMCDAT7 -> NFD7_GB */
#endif
-#ifdef CONFIG_USB_EHCI_UNIPHIER
+#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 */
OpenPOWER on IntegriCloud