Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[pandora-kernel.git] / arch / arm / mach-msm / board-msm7x30.c

diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 05241df..6f3b973 100644 (file)
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/smsc911x.h>
+#include <linux/usb/msm_hsusb.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -39,11 +40,26 @@
 
 extern struct sys_timer msm_timer;
 
+static int hsusb_phy_init_seq[] = {
+       0x30, 0x32,     /* Enable and set Pre-Emphasis Depth to 20% */
+       0x02, 0x36,     /* Disable CDR Auto Reset feature */
+       -1
+};
+
+static struct msm_otg_platform_data msm_otg_pdata = {
+       .phy_init_seq           = hsusb_phy_init_seq,
+       .mode                   = USB_PERIPHERAL,
+       .otg_control            = OTG_PHY_CONTROL,
+};
+
 static struct platform_device *devices[] __initdata = {
 #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)
         &msm_device_uart2,
 #endif
        &msm_device_smd,
+       &msm_device_otg,
+       &msm_device_hsusb,
+       &msm_device_hsusb_host,
 };
 
 static void __init msm7x30_init_irq(void)
@@ -53,6 +69,10 @@ static void __init msm7x30_init_irq(void)
 
 static void __init msm7x30_init(void)
 {
+       msm_device_otg.dev.platform_data = &msm_otg_pdata;
+       msm_device_hsusb.dev.parent = &msm_device_otg.dev;
+       msm_device_hsusb_host.dev.parent = &msm_device_otg.dev;
+
        platform_add_devices(devices, ARRAY_SIZE(devices));
 }