diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:40:23 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:40:23 +0000 |
| commit | fcf932350e979db9a29831a8a03bc300c4502bd5 (patch) | |
| tree | e23a5a7a3a14500a234a111b891a9d2137101c7d /arch/arm/mach-exynos/mach-smdkv310.c | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
| parent | 95de77d4a405cd320ec39c3c19f060eed87fd9ce (diff) | |
| download | talos-op-linux-fcf932350e979db9a29831a8a03bc300c4502bd5.tar.gz talos-op-linux-fcf932350e979db9a29831a8a03bc300c4502bd5.zip | |
Merge branch 'next-samsung-devel-ohci' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/ohci
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdkv310.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index cec2afabe7b4..25a5a405c4bf 100644 --- 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> /* Following are default values for UCON, ULCON and UFCON UART registers */ #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ @@ -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)); |
