Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754864Ab2HARvV (ORCPT ); Wed, 1 Aug 2012 13:51:21 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:37694 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754663Ab2HARua (ORCPT ); Wed, 1 Aug 2012 13:50:30 -0400 From: Matt Sealey To: Linux ARM Kernel Mailing List Cc: Linux Kernel Mailing List , Matt Sealey Subject: [PATCH 4/4] efikamx: remove Efika MX-specific CHRGVBUS hack from the USB driver Date: Wed, 1 Aug 2012 12:49:31 -0500 Message-Id: <1343843371-14143-5-git-send-email-matt@genesi-usa.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343843371-14143-1-git-send-email-matt@genesi-usa.com> References: <1343843371-14143-1-git-send-email-matt@genesi-usa.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1649 Lines: 55 Since we're removing Efika MX support from the tree (for now), remove the hack present in the USB host driver since it will never run and isn't useful on any other systems. Signed-off-by: Matt Sealey --- drivers/usb/host/ehci-mxc.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index c778ffe..062f871 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -118,7 +118,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; @@ -235,25 +234,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: -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/