From patchwork Wed May 19 09:40:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 100832 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4J9gXPE018733 for ; Wed, 19 May 2010 09:42:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753794Ab0ESJmd (ORCPT ); Wed, 19 May 2010 05:42:33 -0400 Received: from smtp.nokia.com ([192.100.122.233]:30537 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752671Ab0ESJmc (ORCPT ); Wed, 19 May 2010 05:42:32 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4J9g3bi023388; Wed, 19 May 2010 12:42:26 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 19 May 2010 12:42:24 +0300 Received: from mgw-sa02.ext.nokia.com ([147.243.1.48]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 19 May 2010 12:42:24 +0300 Received: from scadufax.research.nokia.com (esdhcp041223.research.nokia.com [172.21.41.223]) by mgw-sa02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4J9gKOa003573; Wed, 19 May 2010 12:42:23 +0300 From: felipe.balbi@nokia.com To: Kevin Hilman Cc: Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH 3/3] arm: omap: musb: do not issue SOFTRESET on omap3630 Date: Wed, 19 May 2010 12:40:18 +0300 Message-Id: <1274262018-32631-3-git-send-email-felipe.balbi@nokia.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274262018-32631-1-git-send-email-felipe.balbi@nokia.com> References: <1274262018-32631-1-git-send-email-felipe.balbi@nokia.com> X-OriginalArrivalTime: 19 May 2010 09:42:24.0792 (UTC) FILETIME=[96279980:01CAF737] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 19 May 2010 09:42:34 +0000 (UTC) diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index de3e768..97dae0d 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -54,6 +54,10 @@ void __init usb_musb_pm_init(void) if (!cpu_is_omap34xx()) return; + /* Errata ID i445 fix : Do not use SOFTRESET with OMAP3630 */ + if (cpu_is_omap3630()) + return; + otg_base = ioremap(OMAP34XX_HSUSB_OTG_BASE, SZ_4K); if (WARN_ON(!otg_base)) return;