From: Tony LIU Date: Thu, 9 Feb 2012 02:41:08 +0000 (+0800) Subject: ENGR00174103 [usb hsic] add usb hsic support for mx6dl X-Git-Tag: v3.0.35-fsl~1513 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fdd02dd3b65a91ab65501aa3f49393ab31132ec7;p=karo-tx-linux.git ENGR00174103 [usb hsic] add usb hsic support for mx6dl - change the pad setting Signed-off-by: Tony LIU --- diff --git a/arch/arm/mach-mx6/usb_h2.c b/arch/arm/mach-mx6/usb_h2.c index a1e32efc5b84..4e78ad3a0cf9 100644 --- a/arch/arm/mach-mx6/usb_h2.c +++ b/arch/arm/mach-mx6/usb_h2.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "devices-imx6q.h" #include "regs-anadig.h" #include "usb.h" @@ -179,7 +180,12 @@ static void hsic_start(void) { pr_debug("%s\n", __func__); /* strobe 47K pull up */ - mxc_iomux_v3_setup_pad(MX6Q_PAD_RGMII_TX_CTL__USBOH3_H2_STROBE_START); + if (cpu_is_mx6q()) + mxc_iomux_v3_setup_pad( + MX6Q_PAD_RGMII_TX_CTL__USBOH3_H2_STROBE_START); + else if (cpu_is_mx6dl()) + mxc_iomux_v3_setup_pad( + MX6DL_PAD_RGMII_TX_CTL__USBOH3_H2_STROBE_START); } static void hsic_device_connected(void) diff --git a/arch/arm/mach-mx6/usb_h3.c b/arch/arm/mach-mx6/usb_h3.c index 93210b48805a..46ffc74cce3a 100644 --- a/arch/arm/mach-mx6/usb_h3.c +++ b/arch/arm/mach-mx6/usb_h3.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "devices-imx6q.h" #include "regs-anadig.h" #include "usb.h" @@ -180,7 +181,12 @@ static void hsic_start(void) { pr_debug("%s", __func__); /* strobe 47K pull up */ - mxc_iomux_v3_setup_pad(MX6Q_PAD_RGMII_RXC__USBOH3_H3_STROBE_START); + if (cpu_is_mx6q()) + mxc_iomux_v3_setup_pad( + MX6Q_PAD_RGMII_RXC__USBOH3_H3_STROBE_START); + else if (cpu_is_mx6dl()) + mxc_iomux_v3_setup_pad( + MX6DL_PAD_RGMII_RXC__USBOH3_H3_STROBE_START); } static void hsic_device_connected(void)