]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00262868 msl-mx6: usb: do not enable id wakeup interrupt for non-otg
authorPeter Chen <peter.chen@freescale.com>
Tue, 18 Jun 2013 05:25:00 +0000 (13:25 +0800)
committerOliver Wendt <ow@karo-electronics.de>
Mon, 30 Sep 2013 12:14:06 +0000 (14:14 +0200)
ID wakeup interrupt is only needed at OTG config.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
arch/arm/mach-mx6/usb_dr.c

index 8698b5aa77672738a2d4ff8921f423d73ec5080c..e6496bc9cd506851c576f9b00d2f3345238cddb6 100644 (file)
@@ -519,6 +519,7 @@ static void _host_wakeup_enable(struct fsl_usb2_platform_data *pdata, bool enabl
 {
        void __iomem *phy_reg = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
        __wakeup_irq_enable(pdata, enable, ENABLED_BY_HOST);
+#ifdef CONFIG_USB_OTG
        if (enable) {
                pr_debug("host wakeup enable\n");
                USB_OTG_CTRL |= UCTRL_WKUP_ID_EN;
@@ -532,6 +533,7 @@ static void _host_wakeup_enable(struct fsl_usb2_platform_data *pdata, bool enabl
                udelay(100);
        }
        pr_debug("the otgsc is 0x%x, usbsts is 0x%x, portsc is 0x%x, otgctrl: 0x%x\n", UOG_OTGSC, UOG_USBSTS, UOG_PORTSC1, USB_OTG_CTRL);
+#endif
 }
 
 static enum usb_wakeup_event _is_host_wakeup(struct fsl_usb2_platform_data *pdata)