ENGR00258491-2 msl-mx6: usb: put PHY to be out of low power explicitly

We have wrong understanding that reset controller will put PHY
to be out of low power automatically, but in fact, it is not.
So, we should put PHY to be out of low power explicitly if the
portsc.phcd = 1 before we need to access controller's register.
Some register writing will hang system (eg,PERIODICLISTBASE),
some reading will not get the correct value (eg, otgsc).

Signed-off-by: Peter Chen <peter.chen@freescale.com>

diff --git a/arch/arm/mach-mx6/usb_dr.c b/arch/arm/mach-mx6/usb_dr.c
index 3a51f96cedd34207ff3063a5658dfbf125d01c9a..31f8230165bcb4a7bdafed8dfeb5f422861e9d5a 100644 (file)
--- a/arch/arm/mach-mx6/usb_dr.c
+++ b/arch/arm/mach-mx6/usb_dr.c
@@ -99,6 +99,16 @@ static int usb_phy_enable(struct fsl_usb2_platform_data *pdata)
        UOG_USBCMD |= UCMD_RESET;
        while ((UOG_USBCMD) & (UCMD_RESET))
                ;
+
+       /*
+        * If the controller reset does not put the PHY be out of
+        * low power mode, do it manually.
+        */
+       if (UOG_PORTSC1 & PORTSC_PHCD) {
+               UOG_PORTSC1 &= ~PORTSC_PHCD;
+               mdelay(1);
+       }
+
        /* Reset USBPHY module */
        phy_ctrl = phy_reg + HW_USBPHY_CTRL;
        tmp = __raw_readl(phy_ctrl);

diff --git a/arch/arm/mach-mx6/usb_h1.c b/arch/arm/mach-mx6/usb_h1.c
index c665f640bcb24ea754fc23184c135297adf89191..d14b537891d6d517cf59823495091a0fab85fc4a 100644 (file)
--- a/arch/arm/mach-mx6/usb_h1.c
+++ b/arch/arm/mach-mx6/usb_h1.c
@@ -111,6 +111,16 @@ static int usb_phy_enable(struct fsl_usb2_platform_data *pdata)
        UH1_USBCMD |= UCMD_RESET;
        while ((UH1_USBCMD) & (UCMD_RESET))
                ;
+
+       /*
+        * If the controller reset does not put the PHY be out of
+        * low power mode, do it manually.
+        */
+       if (UH1_PORTSC1 & PORTSC_PHCD) {
+               UH1_PORTSC1 &= ~PORTSC_PHCD;
+               mdelay(1);
+       }
+
        /* Reset USBPHY module */
        phy_ctrl = phy_reg + HW_USBPHY_CTRL;
        tmp = __raw_readl(phy_ctrl);