diff options
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 5328011f2536..5ca0bddf65fa 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -294,6 +294,7 @@ config MACH_ORIGEN | |||
| 294 | select SAMSUNG_DEV_BACKLIGHT | 294 | select SAMSUNG_DEV_BACKLIGHT |
| 295 | select SAMSUNG_DEV_PWM | 295 | select SAMSUNG_DEV_PWM |
| 296 | select EXYNOS4_DEV_PD | 296 | select EXYNOS4_DEV_PD |
| 297 | select EXYNOS4_DEV_USB_OHCI | ||
| 297 | select EXYNOS4_SETUP_FIMD0 | 298 | select EXYNOS4_SETUP_FIMD0 |
| 298 | select EXYNOS4_SETUP_SDHCI | 299 | select EXYNOS4_SETUP_SDHCI |
| 299 | select EXYNOS4_SETUP_USB_PHY | 300 | select EXYNOS4_SETUP_USB_PHY |
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index f80b563f2be7..b805e595cc35 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <plat/fb.h> | 41 | #include <plat/fb.h> |
| 42 | #include <plat/mfc.h> | 42 | #include <plat/mfc.h> |
| 43 | 43 | ||
| 44 | #include <mach/ohci.h> | ||
| 44 | #include <mach/map.h> | 45 | #include <mach/map.h> |
| 45 | 46 | ||
| 46 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 47 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
| @@ -483,6 +484,16 @@ static void __init origen_ehci_init(void) | |||
| 483 | s5p_ehci_set_platdata(pdata); | 484 | s5p_ehci_set_platdata(pdata); |
| 484 | } | 485 | } |
| 485 | 486 | ||
| 487 | /* USB OHCI */ | ||
| 488 | static struct exynos4_ohci_platdata origen_ohci_pdata; | ||
| 489 | |||
| 490 | static void __init origen_ohci_init(void) | ||
| 491 | { | ||
| 492 | struct exynos4_ohci_platdata *pdata = &origen_ohci_pdata; | ||
| 493 | |||
| 494 | exynos4_ohci_set_platdata(pdata); | ||
| 495 | } | ||
| 496 | |||
| 486 | static struct gpio_keys_button origen_gpio_keys_table[] = { | 497 | static struct gpio_keys_button origen_gpio_keys_table[] = { |
| 487 | { | 498 | { |
| 488 | .code = KEY_MENU, | 499 | .code = KEY_MENU, |
| @@ -606,6 +617,7 @@ static struct platform_device *origen_devices[] __initdata = { | |||
| 606 | &s5p_device_mfc_l, | 617 | &s5p_device_mfc_l, |
| 607 | &s5p_device_mfc_r, | 618 | &s5p_device_mfc_r, |
| 608 | &s5p_device_mixer, | 619 | &s5p_device_mixer, |
| 620 | &exynos4_device_ohci, | ||
| 609 | &exynos4_device_pd[PD_LCD0], | 621 | &exynos4_device_pd[PD_LCD0], |
| 610 | &exynos4_device_pd[PD_TV], | 622 | &exynos4_device_pd[PD_TV], |
| 611 | &exynos4_device_pd[PD_G3D], | 623 | &exynos4_device_pd[PD_G3D], |
| @@ -670,6 +682,7 @@ static void __init origen_machine_init(void) | |||
| 670 | s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata); | 682 | s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata); |
| 671 | 683 | ||
| 672 | origen_ehci_init(); | 684 | origen_ehci_init(); |
| 685 | origen_ohci_init(); | ||
| 673 | clk_xusbxti.rate = 24000000; | 686 | clk_xusbxti.rate = 24000000; |
| 674 | 687 | ||
| 675 | s5p_tv_setup(); | 688 | s5p_tv_setup(); |
