diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-05-19 18:46:40 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-06-11 10:44:23 -0400 |
commit | 9c278d52903709543b4716b0e0d03ec58b179308 (patch) | |
tree | c8e6962c3cf90ea5574a47e6e0807d30a494ae20 /arch/arm/mach-exynos | |
parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) |
ARM: EXYNOS: Add HSOTG support to Origen
S3C-HSOTG device is added to Origen board.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 573be57d3d28..da025c8542bd 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -326,6 +326,7 @@ config MACH_ORIGEN | |||
326 | select S3C_DEV_WDT | 326 | select S3C_DEV_WDT |
327 | select S3C_DEV_HSMMC | 327 | select S3C_DEV_HSMMC |
328 | select S3C_DEV_HSMMC2 | 328 | select S3C_DEV_HSMMC2 |
329 | select S3C_DEV_USB_HSOTG | ||
329 | select S5P_DEV_FIMC0 | 330 | select S5P_DEV_FIMC0 |
330 | select S5P_DEV_FIMC1 | 331 | select S5P_DEV_FIMC1 |
331 | select S5P_DEV_FIMC2 | 332 | select S5P_DEV_FIMC2 |
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index f5572be9d7bf..9ed0229db8ae 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/mfd/max8997.h> | 21 | #include <linux/mfd/max8997.h> |
22 | #include <linux/lcd.h> | 22 | #include <linux/lcd.h> |
23 | #include <linux/rfkill-gpio.h> | 23 | #include <linux/rfkill-gpio.h> |
24 | #include <linux/platform_data/s3c-hsotg.h> | ||
24 | 25 | ||
25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
26 | #include <asm/hardware/gic.h> | 27 | #include <asm/hardware/gic.h> |
@@ -499,6 +500,9 @@ static void __init origen_ohci_init(void) | |||
499 | exynos4_ohci_set_platdata(pdata); | 500 | exynos4_ohci_set_platdata(pdata); |
500 | } | 501 | } |
501 | 502 | ||
503 | /* USB OTG */ | ||
504 | static struct s3c_hsotg_plat origen_hsotg_pdata; | ||
505 | |||
502 | static struct gpio_keys_button origen_gpio_keys_table[] = { | 506 | static struct gpio_keys_button origen_gpio_keys_table[] = { |
503 | { | 507 | { |
504 | .code = KEY_MENU, | 508 | .code = KEY_MENU, |
@@ -655,6 +659,7 @@ static struct platform_device *origen_devices[] __initdata = { | |||
655 | &s3c_device_hsmmc0, | 659 | &s3c_device_hsmmc0, |
656 | &s3c_device_i2c0, | 660 | &s3c_device_i2c0, |
657 | &s3c_device_rtc, | 661 | &s3c_device_rtc, |
662 | &s3c_device_usb_hsotg, | ||
658 | &s3c_device_wdt, | 663 | &s3c_device_wdt, |
659 | &s5p_device_ehci, | 664 | &s5p_device_ehci, |
660 | &s5p_device_fimc0, | 665 | &s5p_device_fimc0, |
@@ -744,6 +749,7 @@ static void __init origen_machine_init(void) | |||
744 | 749 | ||
745 | origen_ehci_init(); | 750 | origen_ehci_init(); |
746 | origen_ohci_init(); | 751 | origen_ohci_init(); |
752 | s3c_hsotg_set_platdata(&origen_hsotg_pdata); | ||
747 | clk_xusbxti.rate = 24000000; | 753 | clk_xusbxti.rate = 24000000; |
748 | 754 | ||
749 | s5p_tv_setup(); | 755 | s5p_tv_setup(); |