From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ajay Kumar Gupta Subject: [PATCH 2/3 v5] arm: omap: am335x: enable phy controls Date: Wed, 8 Feb 2012 13:11:11 +0530 Message-ID: <1328686872-22924-2-git-send-email-ajay.gupta@ti.com> References: <1328686872-22924-1-git-send-email-ajay.gupta@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:37823 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228Ab2BHHlT (ORCPT ); Wed, 8 Feb 2012 02:41:19 -0500 In-Reply-To: <1328686872-22924-1-git-send-email-ajay.gupta@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-usb@vger.kernel.org Cc: linux-omap@vger.kernel.org, balbi@ti.com, tony@atomide.com, Ajay Kumar Gupta Switch on the phy for am335x. Signed-off-by: Ajay Kumar Gupta --- arch/arm/mach-omap2/omap_phy_internal.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index 4c90477..7129408 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c @@ -266,7 +266,11 @@ void ti81xx_musb_phy_power(u8 on) void __iomem *scm_base = NULL; u32 usbphycfg; - scm_base = ioremap(TI81XX_SCM_BASE, SZ_2K); + if (cpu_is_ti81xx()) + scm_base = ioremap(TI81XX_SCM_BASE, SZ_2K); + else if (cpu_is_am33xx()) + scm_base = ioremap(AM33XX_SCM_BASE, SZ_2K); + if (!scm_base) { pr_err("system control module ioremap failed\n"); return; @@ -278,16 +282,19 @@ void ti81xx_musb_phy_power(u8 on) if (cpu_is_ti816x()) { usbphycfg |= TI816X_USBPHY0_NORMAL_MODE; usbphycfg &= ~TI816X_USBPHY_REFCLK_OSC; - } else if (cpu_is_ti814x()) { - usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN - | USBPHY_DPINPUT | USBPHY_DMINPUT); - usbphycfg |= (USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN - | USBPHY_DPOPBUFCTL | USBPHY_DMOPBUFCTL); + } else if (cpu_is_ti814x() || cpu_is_am33xx()) { + usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN); + usbphycfg |= USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN; + if (cpu_is_ti814x()) { + usbphycfg &= ~(USBPHY_DPINPUT | USBPHY_DMINPUT); + usbphycfg |= USBPHY_DPOPBUFCTL + | USBPHY_DMOPBUFCTL; + } } } else { if (cpu_is_ti816x()) usbphycfg &= ~TI816X_USBPHY0_NORMAL_MODE; - else if (cpu_is_ti814x()) + else if (cpu_is_ti814x() || cpu_is_am33xx()) usbphycfg |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN; } -- 1.7.0.4