ENGR00177771 usb: usb wakeup enable should include both controller and phy

According to IC guys, it needs to enable/disable usb wakeup setting at
controller and phy side together.

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 96922a200b822fe77de8a0d9d2e058851c466aea..3a8a3a7ec2428edbedd27381cf61d5100f0c04ed 100644 (file)
--- a/arch/arm/mach-mx6/usb_dr.c
+++ b/arch/arm/mach-mx6/usb_dr.c
@@ -28,7 +28,6 @@
 #include "devices-imx6q.h"
 #include "regs-anadig.h"
 #include "usb.h"
-
 static int usbotg_init_ext(struct platform_device *pdev);
 static void usbotg_uninit_ext(struct platform_device *pdev);
 static void usbotg_clock_gate(bool on);
@@ -307,8 +306,7 @@ static void otg_wake_up_enable(struct fsl_usb2_platform_data *pdata, bool enable
 
        pr_debug("%s, enable is %d\n", __func__, enable);
        if (enable) {
-               __raw_writel(BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENVBUSCHG_WKUP
-                               | BM_USBPHY_CTRL_ENDPDMCHG_WKUP
+               __raw_writel(BM_USBPHY_CTRL_ENDPDMCHG_WKUP
                                | BM_USBPHY_CTRL_ENAUTOSET_USBCLKS
                                | BM_USBPHY_CTRL_ENAUTOCLR_PHY_PWD
                                | BM_USBPHY_CTRL_ENAUTOCLR_CLKGATE
@@ -435,12 +433,15 @@ static void _host_phy_lowpower_suspend(struct fsl_usb2_platform_data *pdata, boo
 
 static void _host_wakeup_enable(struct fsl_usb2_platform_data *pdata, bool enable)
 {
+       void __iomem *phy_reg = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
        __wakeup_irq_enable(pdata, enable, ENABLED_BY_HOST);
        if (enable) {
                pr_debug("host wakeup enable\n");
                USB_OTG_CTRL |= UCTRL_WKUP_ID_EN;
+               __raw_writel(BM_USBPHY_CTRL_ENIDCHG_WKUP, phy_reg + HW_USBPHY_CTRL_SET);
        } else {
                pr_debug("host wakeup disable\n");
+               __raw_writel(BM_USBPHY_CTRL_ENIDCHG_WKUP, phy_reg + HW_USBPHY_CTRL_CLR);
                USB_OTG_CTRL &= ~UCTRL_WKUP_ID_EN;
                /* The interrupt must be disabled for at least 3 clock
                 * cycles of the standby clock(32k Hz) , that is 0.094 ms*/
@@ -489,6 +490,7 @@ static void _device_phy_lowpower_suspend(struct fsl_usb2_platform_data *pdata, b
 
 static void _device_wakeup_enable(struct fsl_usb2_platform_data *pdata, bool enable)
 {
+       void __iomem *phy_reg = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
        __wakeup_irq_enable(pdata, enable, ENABLED_BY_DEVICE);
        /* if udc is not used by any gadget, we can not enable the vbus wakeup */
        if (!pdata->port_enables) {
@@ -498,8 +500,10 @@ static void _device_wakeup_enable(struct fsl_usb2_platform_data *pdata, bool ena
        if (enable) {
                pr_debug("device wakeup enable\n");
                USB_OTG_CTRL |= UCTRL_WKUP_VBUS_EN;
+               __raw_writel(BM_USBPHY_CTRL_ENVBUSCHG_WKUP, phy_reg + HW_USBPHY_CTRL_SET);
        } else {
                pr_debug("device wakeup disable\n");
+               __raw_writel(BM_USBPHY_CTRL_ENVBUSCHG_WKUP, phy_reg + HW_USBPHY_CTRL_CLR);
                USB_OTG_CTRL &= ~UCTRL_WKUP_VBUS_EN;
        }
 }

diff --git a/arch/arm/mach-mx6/usb_h1.c b/arch/arm/mach-mx6/usb_h1.c
index 8865556b8256275b6b1789be3541db37d3bd0f72..4d9d1527a0b1413a7685e0eac3142f0318a73652 100644 (file)
--- a/arch/arm/mach-mx6/usb_h1.c
+++ b/arch/arm/mach-mx6/usb_h1.c
@@ -187,6 +187,8 @@ static void _wake_up_enable(struct fsl_usb2_platform_data *pdata, bool enable)
                USB_H1_CTRL |= (UCTRL_OWIE);
        } else {
                USB_H1_CTRL &= ~(UCTRL_OWIE);
+               __raw_writel(BM_USBPHY_CTRL_ENIDCHG_WKUP | BM_USBPHY_CTRL_ENVBUSCHG_WKUP
+                               | BM_USBPHY_CTRL_ENDPDMCHG_WKUP, phy_reg + HW_USBPHY_CTRL_CLR);
                /* The interrupt must be disabled for at least 3
                * cycles of the standby clock(32k Hz) , that is 0.094 ms*/
                udelay(100);