aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Sealey <matt@genesi-usa.com>2012-12-23 06:18:21 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-11 19:20:36 -0500
commitc0304996ba4013df58f807bf2b3ad59df84d7953 (patch)
tree4e32ac1cf0a5685ee214bada3f5c54b38c1c181e
parent430ee58e03f1ed9c2a2b697e2f2e0bb870ce1a23 (diff)
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>
-rw-r--r--drivers/usb/host/ehci-mxc.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index ec7f5d2c90de..6b8c1584065f 100644
--- 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)
94 struct usb_hcd *hcd; 94 struct usb_hcd *hcd;
95 struct resource *res; 95 struct resource *res;
96 int irq, ret; 96 int irq, ret;
97 unsigned int flags;
98 struct ehci_mxc_priv *priv; 97 struct ehci_mxc_priv *priv;
99 struct device *dev = &pdev->dev; 98 struct device *dev = &pdev->dev;
100 struct ehci_hcd *ehci; 99 struct ehci_hcd *ehci;
@@ -205,25 +204,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
205 if (ret) 204 if (ret)
206 goto err_add; 205 goto err_add;
207 206
208 if (pdata->otg) {
209 /*
210 * efikamx and efikasb have some hardware bug which is
211 * preventing usb to work unless CHRGVBUS is set.
212 * It's in violation of USB specs
213 */
214 if (machine_is_mx51_efikamx() || machine_is_mx51_efikasb()) {
215 flags = usb_phy_io_read(pdata->otg,
216 ULPI_OTG_CTRL);
217 flags |= ULPI_OTG_CTRL_CHRGVBUS;
218 ret = usb_phy_io_write(pdata->otg, flags,
219 ULPI_OTG_CTRL);
220 if (ret) {
221 dev_err(dev, "unable to set CHRVBUS\n");
222 goto err_add;
223 }
224 }
225 }
226
227 return 0; 207 return 0;
228 208
229err_add: 209err_add: