Merge branch 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm

* 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: qsd8x50: Platform data isn't init data

diff --combined arch/arm/mach-msm/board-qsd8x50.c
index 2e83913,39925c1..6dde818
--- 1/arch/arm/mach-msm/board-qsd8x50.c
--- 2/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@@ -20,7 -20,6 +20,7 @@@
  #include <linux/gpio.h>
  #include <linux/platform_device.h>
  #include <linux/delay.h>
 +#include <linux/usb/msm_hsusb.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -43,7 -42,7 +43,7 @@@ static const unsigned        qsd8x50_su
   * at run-time: they vary from board to board, and the true
   * configuration won't be known until boot.
   */
- static struct resource smc91x_resources[] __initdata = {
+ static struct resource smc91x_resources[] = {
        [0] = {
                .flags = IORESOURCE_MEM,
        },
@@@ -52,7 -51,7 +52,7 @@@
        },
  };
  
- static struct platform_device smc91x_device __initdata = {
+ static struct platform_device smc91x_device = {
        .name           = "smc91x",
        .id             = 0,
        .num_resources  = ARRAY_SIZE(smc91x_resources),
@@@ -75,24 -74,9 +75,24 @@@ static int __init msm_init_smc91x(void
  }
  module_init(msm_init_smc91x);
  
 +static int hsusb_phy_init_seq[] = {
 +      0x08, 0x31,     /* Increase HS Driver Amplitude */
 +      0x20, 0x32,     /* Enable and set Pre-Emphasis Depth to 10% */
 +      -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 = {
        &msm_device_uart3,
        &msm_device_smd,
 +      &msm_device_otg,
 +      &msm_device_hsusb,
 +      &msm_device_hsusb_host,
  };
  
  static void __init qsd8x50_map_io(void)
@@@ -109,9 -93,6 +109,9 @@@ static void __init qsd8x50_init_irq(voi
  
  static void __init qsd8x50_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));
  }