From 625d541e3efd60ee3308a032fc9385f98be01c5b Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 18 Aug 2010 18:26:42 +0200
Subject: [PATCH] --- yaml --- r: 212496 b: refs/heads/master c:
 ab3d8b5859234d1d60b9592e9e9c5eaa9bb55678 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/mach-mx3/mach-mx35_3ds.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8330e4091a77..4a8080791e8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79a11b0ba4a4e2f042b143e6ac0813d6fab90626
+refs/heads/master: ab3d8b5859234d1d60b9592e9e9c5eaa9bb55678
diff --git a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
index ae0f17cc8d73..1dd7baae4507 100644
--- a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
+++ b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
@@ -38,6 +38,7 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
+#include <mach/mxc_ehci.h>
 
 #include "devices-imx35.h"
 #include "devices.h"
@@ -105,6 +106,9 @@ static struct pad_desc mx35pdk_pads[] = {
 	/* USBOTG */
 	MX35_PAD_USBOTG_PWR__USB_TOP_USBOTG_PWR,
 	MX35_PAD_USBOTG_OC__USB_TOP_USBOTG_OC,
+	/* USBH1 */
+	MX35_PAD_I2C2_CLK__USB_TOP_USBH2_PWR,
+	MX35_PAD_I2C2_DAT__USB_TOP_USBH2_OC,
 };
 
 /* OTG config */
@@ -113,6 +117,13 @@ static struct fsl_usb2_platform_data usb_otg_pdata = {
 	.phy_mode	= FSL_USB2_PHY_UTMI_WIDE,
 };
 
+/* USB HOST config */
+static struct mxc_usbh_platform_data usb_host_pdata = {
+	.portsc		= MXC_EHCI_MODE_SERIAL,
+	.flags		= MXC_EHCI_INTERFACE_SINGLE_UNI |
+			  MXC_EHCI_INTERNAL_PHY,
+};
+
 /*
  * Board specific initialization.
  */
@@ -126,6 +137,8 @@ static void __init mxc_board_init(void)
 
 	mxc_register_device(&mxc_otg_udc_device, &usb_otg_pdata);
 
+	mxc_register_device(&mxc_usbh1, &usb_host_pdata);
+
 	imx35_add_mxc_nand(&mx35pdk_nand_board_info);
 }