Merge branch 'samsung/driver' into next/drivers

[pandora-kernel.git] / arch / arm / mach-exynos / mach-smdkv310.c

diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index a27b23e..b2c5557 100644 (file)
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -42,6 +42,7 @@
 #include <plat/clock.h>
 
 #include <mach/map.h>
+#include <mach/ohci.h>
 
 #include "common.h"
 
@@ -245,6 +246,16 @@ static void __init smdkv310_ehci_init(void)
        s5p_ehci_set_platdata(pdata);
 }
 
+/* USB OHCI */
+static struct exynos4_ohci_platdata smdkv310_ohci_pdata;
+
+static void __init smdkv310_ohci_init(void)
+{
+       struct exynos4_ohci_platdata *pdata = &smdkv310_ohci_pdata;
+
+       exynos4_ohci_set_platdata(pdata);
+}
+
 static struct platform_device *smdkv310_devices[] __initdata = {
        &s3c_device_hsmmc0,
        &s3c_device_hsmmc1,
@@ -261,6 +272,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
        &s5p_device_fimc3,
        &exynos4_device_ac97,
        &exynos4_device_i2s0,
+       &exynos4_device_ohci,
        &samsung_device_keypad,
        &s5p_device_mfc,
        &s5p_device_mfc_l,
@@ -363,6 +375,7 @@ static void __init smdkv310_machine_init(void)
        s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata);
 
        smdkv310_ehci_init();
+       smdkv310_ohci_init();
        clk_xusbxti.rate = 24000000;
 
        platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));