diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2011-08-31 02:47:16 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-02 19:42:21 -0400 |
commit | 24f9e1f31471abbd2af62eb529deee90bad4c65c (patch) | |
tree | 9c86492570f7c0565e985e3b18f22757a1eea2b2 /arch/arm | |
parent | 218f82e6249e79bd4cb38f27e4883770d6caa1da (diff) |
ARM: EXYNOS4: Add USB EHCI device to ORIGEN board
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
[kgene.kim@samsung.com: re-ordering changes in Kconfig]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-origen.c | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 3ceefdbadd19..3034a736f823 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig | |||
@@ -224,7 +224,9 @@ config MACH_ORIGEN | |||
224 | select S3C_DEV_RTC | 224 | select S3C_DEV_RTC |
225 | select S3C_DEV_WDT | 225 | select S3C_DEV_WDT |
226 | select S3C_DEV_HSMMC2 | 226 | select S3C_DEV_HSMMC2 |
227 | select S5P_DEV_USB_EHCI | ||
227 | select EXYNOS4_SETUP_SDHCI | 228 | select EXYNOS4_SETUP_SDHCI |
229 | select EXYNOS4_SETUP_USB_PHY | ||
228 | help | 230 | help |
229 | Machine support for ORIGEN based on Samsung EXYNOS4210 | 231 | Machine support for ORIGEN based on Samsung EXYNOS4210 |
230 | 232 | ||
diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index ed59f86001ac..d101756ef7dc 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c | |||
@@ -24,6 +24,8 @@ | |||
24 | #include <plat/devs.h> | 24 | #include <plat/devs.h> |
25 | #include <plat/sdhci.h> | 25 | #include <plat/sdhci.h> |
26 | #include <plat/iic.h> | 26 | #include <plat/iic.h> |
27 | #include <plat/ehci.h> | ||
28 | #include <plat/clock.h> | ||
27 | 29 | ||
28 | #include <mach/map.h> | 30 | #include <mach/map.h> |
29 | 31 | ||
@@ -79,10 +81,21 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = { | |||
79 | .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, | 81 | .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL, |
80 | }; | 82 | }; |
81 | 83 | ||
84 | /* USB EHCI */ | ||
85 | static struct s5p_ehci_platdata origen_ehci_pdata; | ||
86 | |||
87 | static void __init origen_ehci_init(void) | ||
88 | { | ||
89 | struct s5p_ehci_platdata *pdata = &origen_ehci_pdata; | ||
90 | |||
91 | s5p_ehci_set_platdata(pdata); | ||
92 | } | ||
93 | |||
82 | static struct platform_device *origen_devices[] __initdata = { | 94 | static struct platform_device *origen_devices[] __initdata = { |
83 | &s3c_device_hsmmc2, | 95 | &s3c_device_hsmmc2, |
84 | &s3c_device_rtc, | 96 | &s3c_device_rtc, |
85 | &s3c_device_wdt, | 97 | &s3c_device_wdt, |
98 | &s5p_device_ehci, | ||
86 | }; | 99 | }; |
87 | 100 | ||
88 | static void __init origen_map_io(void) | 101 | static void __init origen_map_io(void) |
@@ -95,6 +108,10 @@ static void __init origen_map_io(void) | |||
95 | static void __init origen_machine_init(void) | 108 | static void __init origen_machine_init(void) |
96 | { | 109 | { |
97 | s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); | 110 | s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); |
111 | |||
112 | origen_ehci_init(); | ||
113 | clk_xusbxti.rate = 24000000; | ||
114 | |||
98 | platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); | 115 | platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); |
99 | } | 116 | } |
100 | 117 | ||