diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2011-04-08 00:22:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 19:53:30 -0400 |
commit | 01da92f7f6436c6c29c11490c7fcdb20fb6c46b8 (patch) | |
tree | 809e102a172e49b78b95864643c2a2ee0fb6bf2f /arch/arm/mach-exynos4 | |
parent | 1bcc5aa87f043d34522d783154d08173b435fb46 (diff) |
ARM: EXYNOS4: Add usb ehci device to the NURI board
This patch is to support usb ehci device to the NURI board.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-exynos4')
-rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/mach-nuri.c | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index e849f67be47d..805196207ce8 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig | |||
@@ -170,6 +170,7 @@ config MACH_NURI | |||
170 | select S3C_DEV_HSMMC3 | 170 | select S3C_DEV_HSMMC3 |
171 | select S3C_DEV_I2C1 | 171 | select S3C_DEV_I2C1 |
172 | select S3C_DEV_I2C5 | 172 | select S3C_DEV_I2C5 |
173 | select S5P_DEV_USB_EHCI | ||
173 | select EXYNOS4_SETUP_I2C1 | 174 | select EXYNOS4_SETUP_I2C1 |
174 | select EXYNOS4_SETUP_I2C5 | 175 | select EXYNOS4_SETUP_I2C5 |
175 | select EXYNOS4_SETUP_SDHCI | 176 | select EXYNOS4_SETUP_SDHCI |
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c index b79ad010d194..bb5d12f43af8 100644 --- a/arch/arm/mach-exynos4/mach-nuri.c +++ b/arch/arm/mach-exynos4/mach-nuri.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include <plat/cpu.h> | 30 | #include <plat/cpu.h> |
31 | #include <plat/devs.h> | 31 | #include <plat/devs.h> |
32 | #include <plat/sdhci.h> | 32 | #include <plat/sdhci.h> |
33 | #include <plat/ehci.h> | ||
34 | #include <plat/clock.h> | ||
33 | 35 | ||
34 | #include <mach/map.h> | 36 | #include <mach/map.h> |
35 | 37 | ||
@@ -262,6 +264,16 @@ static struct i2c_board_info i2c5_devs[] __initdata = { | |||
262 | /* max8997, To be updated */ | 264 | /* max8997, To be updated */ |
263 | }; | 265 | }; |
264 | 266 | ||
267 | /* USB EHCI */ | ||
268 | static struct s5p_ehci_platdata nuri_ehci_pdata; | ||
269 | |||
270 | static void __init nuri_ehci_init(void) | ||
271 | { | ||
272 | struct s5p_ehci_platdata *pdata = &nuri_ehci_pdata; | ||
273 | |||
274 | s5p_ehci_set_platdata(pdata); | ||
275 | } | ||
276 | |||
265 | static struct platform_device *nuri_devices[] __initdata = { | 277 | static struct platform_device *nuri_devices[] __initdata = { |
266 | /* Samsung Platform Devices */ | 278 | /* Samsung Platform Devices */ |
267 | &emmc_fixed_voltage, | 279 | &emmc_fixed_voltage, |
@@ -270,6 +282,7 @@ static struct platform_device *nuri_devices[] __initdata = { | |||
270 | &s3c_device_hsmmc3, | 282 | &s3c_device_hsmmc3, |
271 | &s3c_device_wdt, | 283 | &s3c_device_wdt, |
272 | &s3c_device_timer[0], | 284 | &s3c_device_timer[0], |
285 | &s5p_device_ehci, | ||
273 | 286 | ||
274 | /* NURI Devices */ | 287 | /* NURI Devices */ |
275 | &nuri_gpio_keys, | 288 | &nuri_gpio_keys, |
@@ -291,6 +304,9 @@ static void __init nuri_machine_init(void) | |||
291 | i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs)); | 304 | i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs)); |
292 | i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs)); | 305 | i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs)); |
293 | 306 | ||
307 | nuri_ehci_init(); | ||
308 | clk_xusbxti.rate = 24000000; | ||
309 | |||
294 | /* Last */ | 310 | /* Last */ |
295 | platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices)); | 311 | platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices)); |
296 | } | 312 | } |