Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

[linux-2.6-microblaze.git] / arch / arm / mach-s5pv210 / mach-goni.c

diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 9c4720e..bf5087c 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -25,7 +25,9 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
+#include <linux/mmc/host.h>
 #include <linux/interrupt.h>
+#include <linux/platform_data/s3c-hsotg.h>
 
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
@@ -281,6 +283,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);
@@ -769,6 +774,7 @@ static void __init goni_pmic_init(void)
 /* MoviNAND */
 static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = {
        .max_width              = 4,
+       .host_caps2             = MMC_CAP2_BROKEN_VOLTAGE,
        .cd_type                = S3C_SDHCI_CD_PERMANENT,
 };
 
@@ -943,6 +949,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 */