Re: [PATCH 2/3 v5] arm: omap: am335x: enable phy controls
From: Tony Lindgren <hidden>
Date: 2012-02-10 18:31:43
Hi, * Ajay Kumar Gupta [off-list ref] [120207 19:55]:
quoted hunk
Switch on the phy for am335x. Signed-off-by: Ajay Kumar Gupta <redacted> --- 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;
Please remove all the cpu_is_xxxx calls from the *_phy_power functions. You should need those only in *_phy_init to set the right flags once, not every time you enable or disable the phy. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html