Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into usb-next

2 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 29594fc4fdf4..88e983b0c82e 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -85,6 +85,7 @@ config MACH_AQUILA
         select S5P_DEV_ONENAND
         select S5PV210_SETUP_FB_24BPP
         select S5PV210_SETUP_SDHCI
+        select S5PV210_SETUP_USB_PHY
         help
           Machine support for the Samsung Aquila target based on S5PC110 SoC
 
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 93ab278dadd7..f20a97c8e411 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -279,6 +279,9 @@ static void __init goni_tsp_init(void)
         i2c2_devs[0].irq = gpio_to_irq(gpio);
 }
 
+/* USB OTG */
+static struct s3c_hsotg_plat goni_hsotg_pdata;
+
 static void goni_camera_init(void)
 {
         s5pv210_fimc_setup_gpio(S5P_CAMPORT_A);
@@ -942,6 +945,8 @@ static void __init goni_machine_init(void)
         s3c_set_platdata(&goni_fimc_md_platdata, sizeof(goni_fimc_md_platdata),
                          &s5p_device_fimc_md);
 
+        s3c_hsotg_set_platdata(&goni_hsotg_pdata);
+
         goni_camera_init();
 
         /* SPI */