aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mx31moboard-marxbot.c
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@epfl.ch>2009-08-10 12:33:11 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2009-08-14 06:40:49 -0400
commitb23f1534bb0e0dc97e46fc52bf9bde0c2226763c (patch)
treed455f4683b355544974a60ef5fb5d8247e6588c5 /arch/arm/mach-mx3/mx31moboard-marxbot.c
parent89829d5fe31dc42825f2560c3c2c641709ed594e (diff)
mx31moboard: added usb xcvr reset for mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-marxbot.c')
-rw-r--r--arch/arm/mach-mx3/mx31moboard-marxbot.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c
index 641c3d6153ae..b817a4a5bcba 100644
--- a/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -120,23 +120,25 @@ static struct fsl_usb2_platform_data usb_pdata = {
120 .phy_mode = FSL_USB2_PHY_ULPI, 120 .phy_mode = FSL_USB2_PHY_ULPI,
121}; 121};
122 122
123#define OTG_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST) 123#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
124 PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
125
124#define OTG_EN_B IOMUX_TO_GPIO(MX31_PIN_USB_OC) 126#define OTG_EN_B IOMUX_TO_GPIO(MX31_PIN_USB_OC)
125 127
126static void marxbot_usbotg_init(void) 128static void marxbot_usbotg_init(void)
127{ 129{
128 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, OTG_PAD_CFG); 130 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, USB_PAD_CFG);
129 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, OTG_PAD_CFG); 131 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, USB_PAD_CFG);
130 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, OTG_PAD_CFG); 132 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, USB_PAD_CFG);
131 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, OTG_PAD_CFG); 133 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, USB_PAD_CFG);
132 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, OTG_PAD_CFG); 134 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, USB_PAD_CFG);
133 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, OTG_PAD_CFG); 135 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, USB_PAD_CFG);
134 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, OTG_PAD_CFG); 136 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, USB_PAD_CFG);
135 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, OTG_PAD_CFG); 137 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, USB_PAD_CFG);
136 mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, OTG_PAD_CFG); 138 mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, USB_PAD_CFG);
137 mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, OTG_PAD_CFG); 139 mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, USB_PAD_CFG);
138 mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, OTG_PAD_CFG); 140 mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, USB_PAD_CFG);
139 mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, OTG_PAD_CFG); 141 mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, USB_PAD_CFG);
140 142
141 gpio_request(OTG_EN_B, "usb-udc-en"); 143 gpio_request(OTG_EN_B, "usb-udc-en");
142 gpio_direction_output(OTG_EN_B, 0); 144 gpio_direction_output(OTG_EN_B, 0);