diff options
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdkv310.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index 5b365613b470..b2c5557f50e4 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <plat/clock.h> | 42 | #include <plat/clock.h> |
43 | 43 | ||
44 | #include <mach/map.h> | 44 | #include <mach/map.h> |
45 | #include <mach/ohci.h> | ||
45 | 46 | ||
46 | #include "common.h" | 47 | #include "common.h" |
47 | 48 | ||
@@ -131,9 +132,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd, | |||
131 | gpio_free(EXYNOS4_GPD0(1)); | 132 | gpio_free(EXYNOS4_GPD0(1)); |
132 | #endif | 133 | #endif |
133 | /* fire nRESET on power up */ | 134 | /* fire nRESET on power up */ |
134 | gpio_request(EXYNOS4_GPX0(6), "GPX0"); | 135 | gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0"); |
135 | |||
136 | gpio_direction_output(EXYNOS4_GPX0(6), 1); | ||
137 | mdelay(100); | 136 | mdelay(100); |
138 | 137 | ||
139 | gpio_set_value(EXYNOS4_GPX0(6), 0); | 138 | gpio_set_value(EXYNOS4_GPX0(6), 0); |
@@ -247,6 +246,16 @@ static void __init smdkv310_ehci_init(void) | |||
247 | s5p_ehci_set_platdata(pdata); | 246 | s5p_ehci_set_platdata(pdata); |
248 | } | 247 | } |
249 | 248 | ||
249 | /* USB OHCI */ | ||
250 | static struct exynos4_ohci_platdata smdkv310_ohci_pdata; | ||
251 | |||
252 | static void __init smdkv310_ohci_init(void) | ||
253 | { | ||
254 | struct exynos4_ohci_platdata *pdata = &smdkv310_ohci_pdata; | ||
255 | |||
256 | exynos4_ohci_set_platdata(pdata); | ||
257 | } | ||
258 | |||
250 | static struct platform_device *smdkv310_devices[] __initdata = { | 259 | static struct platform_device *smdkv310_devices[] __initdata = { |
251 | &s3c_device_hsmmc0, | 260 | &s3c_device_hsmmc0, |
252 | &s3c_device_hsmmc1, | 261 | &s3c_device_hsmmc1, |
@@ -263,6 +272,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { | |||
263 | &s5p_device_fimc3, | 272 | &s5p_device_fimc3, |
264 | &exynos4_device_ac97, | 273 | &exynos4_device_ac97, |
265 | &exynos4_device_i2s0, | 274 | &exynos4_device_i2s0, |
275 | &exynos4_device_ohci, | ||
266 | &samsung_device_keypad, | 276 | &samsung_device_keypad, |
267 | &s5p_device_mfc, | 277 | &s5p_device_mfc, |
268 | &s5p_device_mfc_l, | 278 | &s5p_device_mfc_l, |
@@ -365,6 +375,7 @@ static void __init smdkv310_machine_init(void) | |||
365 | s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); | 375 | s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); |
366 | 376 | ||
367 | smdkv310_ehci_init(); | 377 | smdkv310_ehci_init(); |
378 | smdkv310_ohci_init(); | ||
368 | clk_xusbxti.rate = 24000000; | 379 | clk_xusbxti.rate = 24000000; |
369 | 380 | ||
370 | platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); | 381 | platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); |