From: Tony Lin Date: Mon, 1 Aug 2011 05:25:18 +0000 (+0800) Subject: ENGR00153856 [mx6q]platform data is not correctly initialized X-Git-Tag: v3.0.35-fsl_4.1.0~2357 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b85373853a33167c8548a1e39455cb70cc6f5750;p=karo-tx-linux.git ENGR00153856 [mx6q]platform data is not correctly initialized wakeup_pdata is initialized after device register, thus the field can't be initialized correctively. change to the correct sequence. Signed-off-by: Tony Lin --- diff --git a/arch/arm/mach-mx6/usb_h1.c b/arch/arm/mach-mx6/usb_h1.c index 353b79fd2051..b3b354f95371 100644 --- a/arch/arm/mach-mx6/usb_h1.c +++ b/arch/arm/mach-mx6/usb_h1.c @@ -252,8 +252,9 @@ static struct fsl_usb2_wakeup_platform_data usbh1_wakeup_config = { void __init mx6_usb_h1_init(void) { static void __iomem *anatop_base_addr = MX6_IO_ADDRESS(ANATOP_BASE_ADDR); - imx6q_add_fsl_ehci_hs(1, &usbh1_config); usbh1_config.wakeup_pdata = &usbh1_wakeup_config; + imx6q_add_fsl_ehci_hs(1, &usbh1_config); + imx6q_add_fsl_usb2_hs_wakeup(1, &usbh1_wakeup_config); /* Some phy and power's special controls for host1 * 1. The external charger detector needs to be disabled