From patchwork Wed Aug 1 17:49:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Sealey X-Patchwork-Id: 1265521 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 C287DDFAC4 for ; Wed, 1 Aug 2012 17:53:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Swd4c-0002ON-Pt; Wed, 01 Aug 2012 17:51:06 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Swd4F-0002MB-JK for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2012 17:50:44 +0000 Received: by obbta17 with SMTP id ta17so13037228obb.36 for ; Wed, 01 Aug 2012 10:50:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=s+cYkdBLv+flE16ziF1+Hjseycp4EySmciyGfAkA618=; b=RZK9x07NRAqbMVa/gRYTAE9iyBFGXoWTBLl91OmkI1NTjRNZdTBpoD0Jutl8SG+OVf iWfvqlrkjperd3GzuLEmioUTfH6lV8pCFblDebXQkW1oAeysN7z9bRtJREMdvdaZ8ZbX KpNPr2f5uagjIH2Gbk1x97+yJgFZ1M+UGid8lXhpKvvY9kZ6JN5eVfP+aAso9dV5TqOh iDTKv5x4TzHXGCXuYQhioR7Bz0QXIWYL/hJ8bJ2bREDpdAyRIlaEZ7A+NN8o/5Pi2Z3B czAiCR1Rnmf/+O5ZkL4EKBbHpv8/Vt7z7wG2rATVfMJ2jrLB9SPKcA/kloyTL81rTalc szSw== Received: by 10.182.226.41 with SMTP id rp9mr30297393obc.22.1343843430171; Wed, 01 Aug 2012 10:50:30 -0700 (PDT) Received: from shinji.genesi-usa.com ([199.193.222.22]) by mx.google.com with ESMTPS id pj4sm3090595obb.20.2012.08.01.10.50.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 10:50:29 -0700 (PDT) From: Matt Sealey To: Linux ARM Kernel Mailing List 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> X-Gm-Message-State: ALoCoQlbrNpwUtTbrohu9E4z3NT0HPa1fUSlxXXKkcbgPRWy+9baGPQM5A0tIgmbM5Dso/UA1D/v X-Spam-Note: CRM114 invocation failed 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.214.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Matt Sealey , Linux Kernel Mailing List 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 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: