From patchwork Fri May 15 18:40:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 24180 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4FIfYxw005129 for ; Fri, 15 May 2009 18:41:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754471AbZEOSl0 (ORCPT ); Fri, 15 May 2009 14:41:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755089AbZEOSl0 (ORCPT ); Fri, 15 May 2009 14:41:26 -0400 Received: from wa-out-1112.google.com ([209.85.146.182]:38335 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754471AbZEOSlY (ORCPT ); Fri, 15 May 2009 14:41:24 -0400 Received: by wa-out-1112.google.com with SMTP id j5so746788wah.21 for ; Fri, 15 May 2009 11:41:26 -0700 (PDT) Received: by 10.115.108.5 with SMTP id k5mr5274674wam.90.1242412886232; Fri, 15 May 2009 11:41:26 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id m30sm1791248wag.18.2009.05.15.11.41.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 15 May 2009 11:41:25 -0700 (PDT) From: Kevin Hilman To: linux-arm-kernel@lists.arm.linux.org.uk Cc: linux-omap@vger.kernel.org, "Peter 'p2' De Schrijver" , Kevin Hilman Subject: [PATCH 08/11] OMAP3: PM: Ensure MUSB block can idle when driver not loaded Date: Fri, 15 May 2009 11:40:48 -0700 Message-Id: <1242412851-16606-9-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.2.2 In-Reply-To: <1242412851-16606-8-git-send-email-khilman@deeprootsystems.com> References: <1242412851-16606-1-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-2-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-3-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-4-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-5-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-6-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-7-git-send-email-khilman@deeprootsystems.com> <1242412851-16606-8-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Peter 'p2' De Schrijver Otherwise, bootloaders may leave MUSB in a state which prevents retention. Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/usb-musb.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 215d463..57e857e 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -31,6 +31,8 @@ #include #include +#define OTG_SYSCONFIG (OMAP34XX_HSUSB_OTG_BASE + 0x404) + static struct resource musb_resources[] = { [0] = { /* start and end set dynamically */ .flags = IORESOURCE_MEM, @@ -183,4 +185,8 @@ void __init usb_musb_init(void) printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); return; } + + /* Ensure force-idle mode for OTG controller */ + if (cpu_is_omap34xx()) + omap_writel(0, OTG_SYSCONFIG); }