diff options
author | Jingoo Han <jg1.han@samsung.com> | 2011-09-27 21:33:25 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 06:01:35 -0400 |
commit | 9830f6a20d841acc36bd9ee275aa4586dd713749 (patch) | |
tree | fe3fd31fa02a9cacfe4a202f474a77eb6f713ca6 /arch/arm | |
parent | 8b069b7709c6b5d1492342164976ebfa178de31f (diff) |
ARM: EXYNOS4: Add usb ehci device to the SMDKV310
This patch is to support usb ehci device to the SMDKV310 board.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
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-smdkv310.c | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 980ffd6ccc4e..c4068fd7b83c 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig | |||
@@ -142,6 +142,7 @@ config MACH_SMDKV310 | |||
142 | select S5P_DEV_I2C_HDMIPHY | 142 | select S5P_DEV_I2C_HDMIPHY |
143 | select S5P_DEV_MFC | 143 | select S5P_DEV_MFC |
144 | select S5P_DEV_TV | 144 | select S5P_DEV_TV |
145 | select S5P_DEV_USB_EHCI | ||
145 | select S3C_DEV_HSMMC | 146 | select S3C_DEV_HSMMC |
146 | select S3C_DEV_HSMMC1 | 147 | select S3C_DEV_HSMMC1 |
147 | select S3C_DEV_HSMMC2 | 148 | select S3C_DEV_HSMMC2 |
@@ -156,6 +157,7 @@ config MACH_SMDKV310 | |||
156 | select EXYNOS4_SETUP_I2C1 | 157 | select EXYNOS4_SETUP_I2C1 |
157 | select EXYNOS4_SETUP_KEYPAD | 158 | select EXYNOS4_SETUP_KEYPAD |
158 | select EXYNOS4_SETUP_SDHCI | 159 | select EXYNOS4_SETUP_SDHCI |
160 | select EXYNOS4_SETUP_USB_PHY | ||
159 | help | 161 | help |
160 | Machine support for Samsung SMDKV310 | 162 | Machine support for Samsung SMDKV310 |
161 | 163 | ||
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c index 5ba432e21e27..0fa734c1aa69 100644 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c | |||
@@ -33,6 +33,8 @@ | |||
33 | #include <plat/gpio-cfg.h> | 33 | #include <plat/gpio-cfg.h> |
34 | #include <plat/backlight.h> | 34 | #include <plat/backlight.h> |
35 | #include <plat/mfc.h> | 35 | #include <plat/mfc.h> |
36 | #include <plat/ehci.h> | ||
37 | #include <plat/clock.h> | ||
36 | 38 | ||
37 | #include <mach/map.h> | 39 | #include <mach/map.h> |
38 | 40 | ||
@@ -167,6 +169,16 @@ static struct i2c_board_info i2c_devs1[] __initdata = { | |||
167 | {I2C_BOARD_INFO("wm8994", 0x1a),}, | 169 | {I2C_BOARD_INFO("wm8994", 0x1a),}, |
168 | }; | 170 | }; |
169 | 171 | ||
172 | /* USB EHCI */ | ||
173 | static struct s5p_ehci_platdata smdkv310_ehci_pdata; | ||
174 | |||
175 | static void __init smdkv310_ehci_init(void) | ||
176 | { | ||
177 | struct s5p_ehci_platdata *pdata = &smdkv310_ehci_pdata; | ||
178 | |||
179 | s5p_ehci_set_platdata(pdata); | ||
180 | } | ||
181 | |||
170 | static struct platform_device *smdkv310_devices[] __initdata = { | 182 | static struct platform_device *smdkv310_devices[] __initdata = { |
171 | &s3c_device_hsmmc0, | 183 | &s3c_device_hsmmc0, |
172 | &s3c_device_hsmmc1, | 184 | &s3c_device_hsmmc1, |
@@ -176,6 +188,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { | |||
176 | &s5p_device_i2c_hdmiphy, | 188 | &s5p_device_i2c_hdmiphy, |
177 | &s3c_device_rtc, | 189 | &s3c_device_rtc, |
178 | &s3c_device_wdt, | 190 | &s3c_device_wdt, |
191 | &s5p_device_ehci, | ||
179 | &exynos4_device_ac97, | 192 | &exynos4_device_ac97, |
180 | &exynos4_device_i2s0, | 193 | &exynos4_device_i2s0, |
181 | &samsung_device_keypad, | 194 | &samsung_device_keypad, |
@@ -276,6 +289,9 @@ static void __init smdkv310_machine_init(void) | |||
276 | 289 | ||
277 | samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data); | 290 | samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data); |
278 | 291 | ||
292 | smdkv310_ehci_init(); | ||
293 | clk_xusbxti.rate = 24000000; | ||
294 | |||
279 | platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); | 295 | platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); |
280 | s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev; | 296 | s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev; |
281 | } | 297 | } |