From 572f03cfb0ab61f1a27058bc8bf0026a3d767b57 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 29 Oct 2013 13:59:18 +0400 Subject: [PATCH] USB: i.MX5x: Remove usage of MXC_EHCI_INTERNAL_PHY for OTG port i.MX5x OTG port is hardwired to the internal UTMI PHY, so having this configurable makes no sense and helps using this port with DT. Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/ccxmx51/ccxmx51.c | 3 +-- drivers/usb/imx/imx-usb-misc.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 6b5acb297..6d2606ed0 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -220,8 +220,7 @@ static const struct spi_board_info ccxmx51_spi_board_info[] = { }; static struct imxusb_platformdata ccxmx51_otg_pdata = { - .flags = MXC_EHCI_MODE_UTMI_16_BIT | MXC_EHCI_INTERNAL_PHY | - MXC_EHCI_POWER_PINS_ENABLED, + .flags = MXC_EHCI_MODE_UTMI_16_BIT | MXC_EHCI_POWER_PINS_ENABLED, .mode = IMX_USB_MODE_HOST, }; diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c index 51d549c2c..68c8c4beb 100644 --- a/drivers/usb/imx/imx-usb-misc.c +++ b/drivers/usb/imx/imx-usb-misc.c @@ -279,9 +279,6 @@ static __maybe_unused int mx5_initialize_usb_hw(void __iomem *base, int port, switch (port) { case 0: /* OTG port */ - if (!(flags & MXC_EHCI_INTERNAL_PHY)) - return 0; - /* Adjust UTMI PHY frequency to 24MHz */ v = readl(base + MX5_UTMI_PHY_CTRL_1); v = (v & ~0x3) | 0x01;