From patchwork Fri Jul 4 17:02:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick X-Patchwork-Id: 4482111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 14400BEEAA for ; Fri, 4 Jul 2014 17:04:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B11920304 for ; Fri, 4 Jul 2014 17:04:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94B59202F2 for ; Fri, 4 Jul 2014 17:04:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X36sZ-000816-R6; Fri, 04 Jul 2014 17:02:31 +0000 Received: from mail-ig0-x22f.google.com ([2607:f8b0:4001:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X36sW-0007ig-Tt for linux-arm-kernel@lists.infradead.org; Fri, 04 Jul 2014 17:02:29 +0000 Received: by mail-ig0-f175.google.com with SMTP id h3so8931996igd.2 for ; Fri, 04 Jul 2014 10:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PDLq80uTimcx2vUSnaRsq+vQ1MB4nhHeiNoLpMQZF7U=; b=cdooyQzAcRs5EvrkpOp+CBgiqY5NA0Y+gMZsD5kSGvONzAB1ED4qzyh+fOo1iu9od3 vWpeytoDMD4wIg1w7hN2O73iWrMH1QdmIh39gpAL5mJuEZbsCXKgwMv9RNrnPQQLkfGG BpmI6LJJxwK88cMmiab1VdD8PEl51Mtwid35qNVAlpDFlZABwbUnXQVPfoRYMifsbfA2 bOoLjtCgxLUMZNKrT2oUyL+KTqTOH4bVdT0IDP9EbKN/RtxFp2vL3MOsWFN1sANgsB0Z 3cRK+AGTsrCJi2oytC8Lyfi3feRiOD6hgv7P2YPNP2fDaHEF8pQFPUyq5891WuXLUMCF ieFA== X-Received: by 10.42.139.4 with SMTP id e4mr9376612icu.73.1404493327087; Fri, 04 Jul 2014 10:02:07 -0700 (PDT) Received: from nick-System-Product-Name.phub.net.cable.rogers.com (CPE0026f3330aca-CM0026f3330ac6.cpe.net.cable.rogers.com. [99.232.64.167]) by mx.google.com with ESMTPSA id qa4sm63778685igb.10.2014.07.04.10.02.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jul 2014 10:02:06 -0700 (PDT) From: Nicholas Krause To: balbi@ti.com Subject: [PATCH] mach-omap1: Fix call to omap_cfg_reg Date: Fri, 4 Jul 2014 13:02:00 -0400 Message-Id: <1404493320-5606-1-git-send-email-xerofoify@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140704_100229_011796_2E99F772 X-CRM114-Status: GOOD ( 11.18 ) X-Spam-Score: -0.8 (/) Cc: linux@arm.linux.org.uk, tony@atomide.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the call to ompa_cfg_reg(USB2_SPEED) in the case that the cpu is a omap16xx and the nwires are not equal to 3. Signed-off-by: Nicholas Krause --- arch/arm/mach-omap1/usb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c index 4118db5..17e3139 100644 --- a/arch/arm/mach-omap1/usb.c +++ b/arch/arm/mach-omap1/usb.c @@ -504,8 +504,7 @@ static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup) omap_cfg_reg(W9_USB2_TXEN); omap_cfg_reg(W5_USB2_SE0); if (nwires != 3) - omap_cfg_reg(Y5_USB2_RCV); - // FIXME omap_cfg_reg(USB2_SPEED); + omap_cfg_reg(USB2_SPEED) } else { pr_debug("usb%d cpu unrecognized\n", 1); return 0;