Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0304996 authored by Matt Sealey's avatar Matt Sealey Committed by Greg Kroah-Hartman
Browse files

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: default avatarMatt Sealey <matt@genesi-usa.com>
Tested-by: default avatarSteev Klimazewski <steev@genesi-usa.com>
CC: Sascha Hauer <kernel@pengutronix.de>
CC: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 430ee58e

drivers/usb/host/ehci-mxc.c

+0 −20
Original line number Diff line number Diff line
@@ -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: