From: Peter Chen Date: Tue, 18 Jun 2013 05:25:00 +0000 (+0800) Subject: ENGR00262868 msl-mx6: usb: do not enable id wakeup interrupt for non-otg X-Git-Tag: v3.0.35-fsl_4.1.0~84 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2aa17dc84a1f9b4c5f5a8ba83521f52d3c15e0e5;p=karo-tx-linux.git ENGR00262868 msl-mx6: usb: do not enable id wakeup interrupt for non-otg ID wakeup interrupt is only needed at OTG config. Signed-off-by: Peter Chen --- diff --git a/arch/arm/mach-mx6/usb_dr.c b/arch/arm/mach-mx6/usb_dr.c index 8698b5aa7767..e6496bc9cd50 100644 --- a/arch/arm/mach-mx6/usb_dr.c +++ b/arch/arm/mach-mx6/usb_dr.c @@ -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)