ENGR00209480-2 mx6sl_usb:change usb irq number for mx6sl

- in mx6sl RM, the irq of usb h1(usb otg2) is 72, but
  in fact, it should be 74, we need change the irq special
  for mx6sl

Signed-off-by: Tony LIU <junjie.liu@freescale.com>

diff --git a/arch/arm/mach-mx6/devices-imx6q.h b/arch/arm/mach-mx6/devices-imx6q.h
index 995a5bd751ebbb63580af97cf416cf02400056b6..cf7f3c85524b07fe303cd8e67d5757678e167539 100644 (file)
--- a/arch/arm/mach-mx6/devices-imx6q.h
+++ b/arch/arm/mach-mx6/devices-imx6q.h
@@ -70,6 +70,10 @@ extern const struct imx_mxc_ehci_data imx6q_mxc_ehci_hs_data[] __initconst;
 #define imx6q_add_fsl_ehci_hs(id, pdata)       \
        imx_add_fsl_ehci(&imx6q_mxc_ehci_hs_data[id - 1], pdata)
 
+extern const struct imx_mxc_ehci_data imx6sl_mxc_ehci_hs_data[] __initconst;
+#define imx6sl_add_fsl_ehci_hs(id, pdata)      \
+       imx_add_fsl_ehci(&imx6sl_mxc_ehci_hs_data[id - 1], pdata)
+
 extern const struct imx_fsl_usb2_otg_data imx6q_fsl_usb2_otg_data __initconst;
 #define imx6q_add_fsl_usb2_otg(pdata)  \
        imx_add_fsl_usb2_otg(&imx6q_fsl_usb2_otg_data, pdata)

diff --git a/arch/arm/mach-mx6/usb_h1.c b/arch/arm/mach-mx6/usb_h1.c
index 478ead40cf0df4f456b8e40a93c0542040e9ff49..e36ec6f837f40260aaf8d100da202cba08182ac4 100644 (file)
--- a/arch/arm/mach-mx6/usb_h1.c
+++ b/arch/arm/mach-mx6/usb_h1.c
@@ -350,7 +350,10 @@ void __init mx6_usb_h1_init(void)
        struct platform_device *pdev, *pdev_wakeup;
        static void __iomem *anatop_base_addr = MX6_IO_ADDRESS(ANATOP_BASE_ADDR);
        usbh1_config.wakeup_pdata = &usbh1_wakeup_config;
-       pdev = imx6q_add_fsl_ehci_hs(1, &usbh1_config);
+       if (cpu_is_mx6sl())
+               pdev = imx6sl_add_fsl_ehci_hs(1, &usbh1_config);
+       else
+               pdev = imx6q_add_fsl_ehci_hs(1, &usbh1_config);
        usbh1_wakeup_config.usb_pdata[0] = pdev->dev.platform_data;
        pdev_wakeup = imx6q_add_fsl_usb2_hs_wakeup(1, &usbh1_wakeup_config);
        ((struct fsl_usb2_platform_data *)(pdev->dev.platform_data))->wakeup_pdata =

diff --git a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
index 700cf468ea8ee0019383e1a850b0af5900e57050..94fdf119a5b8f5541df4121546cceec4b50782d1 100644 (file)
--- a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
+++ b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
@@ -58,6 +58,14 @@ const struct imx_mxc_ehci_data imx6q_mxc_ehci_hs_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX6Q */
 
+#ifdef CONFIG_SOC_IMX6SL
+const struct imx_mxc_ehci_data imx6sl_mxc_ehci_hs_data[] __initconst = {
+       imx_mxc_ehci_data_entry_single(MX6SL, 1, HS1),
+       imx_mxc_ehci_data_entry_single(MX6SL, 2, HS2),
+       imx_mxc_ehci_data_entry_single(MX6SL, 3, HS3),
+};
+#endif /* ifdef CONFIG_SOC_IMX6SL */
+
 struct platform_device *__init imx_add_mxc_ehci(
                const struct imx_mxc_ehci_data *data,
                const struct mxc_usbh_platform_data *pdata)

diff --git a/arch/arm/plat-mxc/include/mach/mx6.h b/arch/arm/plat-mxc/include/mach/mx6.h
index ca4daece7fba6ae96d1c6278be638df358e375ab..9cf2a21959eddb6a96259f2b3074b30d03cc263a 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx6.h
+++ b/arch/arm/plat-mxc/include/mach/mx6.h
@@ -364,9 +364,9 @@
 #define MX6Q_INT_USB_HS1               72
 #define MX6SL_INT_USB_HS1              74
 #define MX6Q_INT_USB_HS2               73
-#define MX6SL_INT_USB_HS2              72
+#define MX6SL_INT_USB_HS2              73
 #define MX6Q_INT_USB_HS3               74
-#define MX6SL_INT_USB_HS3              73
+#define MX6SL_INT_USB_HS3              72
 #define MX6Q_INT_USB_OTG               75
 #define MX6Q_INT_USB_PHY0              76
 #define MX6Q_INT_USB_PHY1              77