From b818db824d0fa2f08bdf97bc9dc9edc93b154a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20R=C3=A9tornaz?= <philippe.retornaz@epfl.ch>
Date: Tue, 11 May 2010 16:57:50 +0200
Subject: [PATCH] --- yaml --- r: 198463 b: refs/heads/master c:
 66c202ad9a58905e0e6a0fa3976020a7ab0fa6df h: refs/heads/master i:   198461:
 1fd396bbf7f933d148b5075e02be459181c32fb6   198459:
 c9431d1351eb6429fd47eb3134cad67f5b6a81f9   198455:
 5c5242b92dfdaa051c7d621465c05751cc77c576   198447:
 33b8e3421911cded22ad4603f2381ea01ca1fce6   198431:
 e9ad65e0678266288ad2d40743922a35ef8561b0   198399:
 7a4528398e3889fbf7f32a24bbaac1f1b7ab2b84 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-mx3/mach-mx31moboard.c     | 7 -------
 trunk/arch/arm/mach-mx3/mx31moboard-devboard.c | 9 +++++++++
 trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c  | 8 ++++++++
 trunk/arch/arm/mach-mx3/mx31moboard-smartbot.c | 8 ++++++++
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0f2486b6ac75..8012aea52db8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25783602050600b294086d6a0be9a0c2cfe8a3e3
+refs/heads/master: 66c202ad9a58905e0e6a0fa3976020a7ab0fa6df
diff --git a/trunk/arch/arm/mach-mx3/mach-mx31moboard.c b/trunk/arch/arm/mach-mx3/mach-mx31moboard.c
index 5c4448947d78..4bb011afc2a3 100644
--- a/trunk/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/trunk/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -18,7 +18,6 @@
 
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
-#include <linux/fsl_devices.h>
 #include <linux/gfp.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
@@ -353,11 +352,6 @@ static void usb_xcvr_reset(void)
 	mdelay(1);
 }
 
-static struct fsl_usb2_platform_data usb_pdata = {
-	.operating_mode	= FSL_USB2_DR_DEVICE,
-	.phy_mode	= FSL_USB2_PHY_ULPI,
-};
-
 #if defined(CONFIG_USB_ULPI)
 
 static struct mxc_usbh_platform_data usbh2_pdata = {
@@ -485,7 +479,6 @@ static void __init mxc_board_init(void)
 
 	usb_xcvr_reset();
 
-	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
 	moboard_usbh2_init();
 
 	switch (mx31moboard_baseboard) {
diff --git a/trunk/arch/arm/mach-mx3/mx31moboard-devboard.c b/trunk/arch/arm/mach-mx3/mx31moboard-devboard.c
index 11b906ce7eae..582299cb2c08 100644
--- a/trunk/arch/arm/mach-mx3/mx31moboard-devboard.c
+++ b/trunk/arch/arm/mach-mx3/mx31moboard-devboard.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/fsl_devices.h>
 
 #include <linux/usb/otg.h>
 
@@ -213,6 +214,12 @@ static int __init devboard_usbh1_init(void)
 	return mxc_register_device(&mxc_usbh1, &usbh1_pdata);
 }
 
+
+static struct fsl_usb2_platform_data usb_pdata = {
+	.operating_mode	= FSL_USB2_DR_DEVICE,
+	.phy_mode	= FSL_USB2_PHY_ULPI,
+};
+
 /*
  * system init for baseboard usage. Will be called by mx31moboard init.
  */
@@ -229,5 +236,7 @@ void __init mx31moboard_devboard_init(void)
 
 	devboard_init_sel_gpios();
 
+	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
+
 	devboard_usbh1_init();
 }
diff --git a/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c b/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
index ffb105e14d88..4930f8c27e66 100644
--- a/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
+#include <linux/fsl_devices.h>
 
 #include <linux/usb/otg.h>
 
@@ -329,6 +330,11 @@ static int __init marxbot_usbh1_init(void)
 	return mxc_register_device(&mxc_usbh1, &usbh1_pdata);
 }
 
+static struct fsl_usb2_platform_data usb_pdata = {
+	.operating_mode	= FSL_USB2_DR_DEVICE,
+	.phy_mode	= FSL_USB2_PHY_ULPI,
+};
+
 /*
  * system init for baseboard usage. Will be called by mx31moboard init.
  */
@@ -356,5 +362,7 @@ void __init mx31moboard_marxbot_init(void)
 	gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0));
 	gpio_export(IOMUX_TO_GPIO(MX31_PIN_LCS0), false);
 
+	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
+
 	marxbot_usbh1_init();
 }
diff --git a/trunk/arch/arm/mach-mx3/mx31moboard-smartbot.c b/trunk/arch/arm/mach-mx3/mx31moboard-smartbot.c
index 83d2b9f42cec..ac1a163a5b78 100644
--- a/trunk/arch/arm/mach-mx3/mx31moboard-smartbot.c
+++ b/trunk/arch/arm/mach-mx3/mx31moboard-smartbot.c
@@ -23,6 +23,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
+#include <linux/fsl_devices.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
@@ -116,6 +117,11 @@ static int __init smartbot_cam_init(void)
 	return 0;
 }
 
+static struct fsl_usb2_platform_data usb_pdata = {
+	.operating_mode	= FSL_USB2_DR_DEVICE,
+	.phy_mode	= FSL_USB2_PHY_ULPI,
+};
+
 #define POWER_EN IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1)
 #define DSPIC_RST_B IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1)
 #define TRSLAT_RST_B IOMUX_TO_GPIO(MX31_PIN_RI_DCE1)
@@ -155,6 +161,8 @@ void __init mx31moboard_smartbot_init(void)
 
 	mxc_register_device(&mxc_uart_device1, &uart_pdata);
 
+	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
+
 	smartbot_resets_init();
 
 	smartbot_cam_init();