From patchwork Sun Dec 23 11:18:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Sealey X-Patchwork-Id: 1907111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 35BFBDF25A for ; Sun, 23 Dec 2012 11:21:10 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TmjZj-0001eY-4h; Sun, 23 Dec 2012 11:18:35 +0000 Received: from mail-oa0-f51.google.com ([209.85.219.51]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TmjZg-0001da-1u for linux-arm-kernel@lists.infradead.org; Sun, 23 Dec 2012 11:18:32 +0000 Received: by mail-oa0-f51.google.com with SMTP id n12so6133066oag.10 for ; Sun, 23 Dec 2012 03:18:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=w3k9Q8M2ZIPBFGYSCly3ZnXJA9IkNuxqmdN9dNLavH4=; b=S7Kzpqwut+pdiIYOanOzrIQyNXVrcIacCftgfYUVbGyNriZ4Wc2uoydaouHj8aIzAj ysGbs+0PGl0YcXwzyGlxxcDMA1zRN5s/oVB9b8sx/N/KOPgZSgu9AhZv5F5axpOj5Uwm fHngUbplRUtjPBYl/yqlWSgD4Chcom06s+vfQFAQu1K9KZWgGtbzLoyQufaSLVEhuOT4 yUWsLyR9sqxaoHSPB9VHjRCkjrPJeNSKkNA/X1kPvs1opQcNt5X621eAvg4hUPSGvrQz CZkvneFm8JEvY9KlPs1VUnNRI2FurmRYKNtaWNiqmnmlAYnLcEIPkHel7JcZDRXcVvAL xgBA== X-Received: by 10.182.131.3 with SMTP id oi3mr11167412obb.13.1356261510651; Sun, 23 Dec 2012 03:18:30 -0800 (PST) Received: from queequeg.bakuhatsu.net (cpe-72-177-208-182.satx.res.rr.com. [72.177.208.182]) by mx.google.com with ESMTPS id aw4sm12408931oec.9.2012.12.23.03.18.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 03:18:29 -0800 (PST) From: Matt Sealey To: Linux ARM Kernel Mailing List , Linux Kernel Mailing List , Linux USB Mailing List Subject: [PATCH] ehci-mxc: remove Efika MX-specific CHRGVBUS hack Date: Sun, 23 Dec 2012 05:18:21 -0600 Message-Id: <1356261501-8465-1-git-send-email-matt@genesi-usa.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkcdAciNCBruGSmS71NBuWeSJ56YgnoZ5FHLR7seirtsjTQOQVRRNA1K5/EYToHkdDq6iuh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121223_061832_186538_9EB964A8 X-CRM114-Status: GOOD ( 13.25 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.51 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Matt Sealey , Shawn Guo , Alan Stern , Sascha Hauer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Tested-by: Steev Klimazewski CC: Sascha Hauer CC: Alan Stern --- 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 8e58a5f..b62c3a8 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -102,7 +102,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; @@ -213,25 +212,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: