USB: ehci-mxc: remove Efika MX-specific CHRGVBUS hack

Since Efika MX platform support (pre-devicetree) was removed from the tree
this code no longer has any possibility of running and clutters up the
driver which is being replaced by the chipidea host in the future anyway.

Signed-off-by: Matt Sealey <matt@genesi-usa.com>
Tested-by: Steev Klimazewski <steev@genesi-usa.com>
CC: Sascha Hauer <kernel@pengutronix.de>
CC: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index ec7f5d2c90de3464f66a000583fa151fde29946e..6b8c1584065f5609c6a3396026dd571de6d69877 100644 (file)
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -94,7 +94,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
        struct usb_hcd *hcd;
        struct resource *res;
        int irq, ret;
-       unsigned int flags;
        struct ehci_mxc_priv *priv;
        struct device *dev = &pdev->dev;
        struct ehci_hcd *ehci;
@@ -205,25 +204,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
        if (ret)
                goto err_add;
 
-       if (pdata->otg) {
-               /*
-                * efikamx and efikasb have some hardware bug which is
-                * preventing usb to work unless CHRGVBUS is set.
-                * It's in violation of USB specs
-                */
-               if (machine_is_mx51_efikamx() || machine_is_mx51_efikasb()) {
-                       flags = usb_phy_io_read(pdata->otg,
-                                                       ULPI_OTG_CTRL);
-                       flags |= ULPI_OTG_CTRL_CHRGVBUS;
-                       ret = usb_phy_io_write(pdata->otg, flags,
-                                                       ULPI_OTG_CTRL);
-                       if (ret) {
-                               dev_err(dev, "unable to set CHRVBUS\n");
-                               goto err_add;
-                       }
-               }
-       }
-
        return 0;
 
 err_add: