diff options
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index e81c35f936b5..b8df521fb68e 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -232,6 +232,9 @@ config MACH_ARMLEX4210 | |||
| 232 | config MACH_UNIVERSAL_C210 | 232 | config MACH_UNIVERSAL_C210 |
| 233 | bool "Mobile UNIVERSAL_C210 Board" | 233 | bool "Mobile UNIVERSAL_C210 Board" |
| 234 | select CPU_EXYNOS4210 | 234 | select CPU_EXYNOS4210 |
| 235 | select S5P_HRT | ||
| 236 | select CLKSRC_MMIO | ||
| 237 | select HAVE_SCHED_CLOCK | ||
| 235 | select S5P_GPIO_INT | 238 | select S5P_GPIO_INT |
| 236 | select S5P_DEV_FIMC0 | 239 | select S5P_DEV_FIMC0 |
| 237 | select S5P_DEV_FIMC1 | 240 | select S5P_DEV_FIMC1 |
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index cb2b027f09a6..a34036eb8ba2 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <plat/pd.h> | 40 | #include <plat/pd.h> |
| 41 | #include <plat/regs-fb-v4.h> | 41 | #include <plat/regs-fb-v4.h> |
| 42 | #include <plat/fimc-core.h> | 42 | #include <plat/fimc-core.h> |
| 43 | #include <plat/s5p-time.h> | ||
| 43 | #include <plat/camport.h> | 44 | #include <plat/camport.h> |
| 44 | #include <plat/mipi_csis.h> | 45 | #include <plat/mipi_csis.h> |
| 45 | 46 | ||
| @@ -1063,6 +1064,7 @@ static void __init universal_map_io(void) | |||
| 1063 | exynos_init_io(NULL, 0); | 1064 | exynos_init_io(NULL, 0); |
| 1064 | s3c24xx_init_clocks(24000000); | 1065 | s3c24xx_init_clocks(24000000); |
| 1065 | s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); | 1066 | s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); |
| 1067 | s5p_set_timer_source(S5P_PWM2, S5P_PWM4); | ||
| 1066 | } | 1068 | } |
| 1067 | 1069 | ||
| 1068 | static void s5p_tv_setup(void) | 1070 | static void s5p_tv_setup(void) |
| @@ -1113,7 +1115,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") | |||
| 1113 | .map_io = universal_map_io, | 1115 | .map_io = universal_map_io, |
| 1114 | .handle_irq = gic_handle_irq, | 1116 | .handle_irq = gic_handle_irq, |
| 1115 | .init_machine = universal_machine_init, | 1117 | .init_machine = universal_machine_init, |
| 1116 | .timer = &exynos4_timer, | 1118 | .timer = &s5p_timer, |
| 1117 | .reserve = &universal_reserve, | 1119 | .reserve = &universal_reserve, |
| 1118 | .restart = exynos4_restart, | 1120 | .restart = exynos4_restart, |
| 1119 | MACHINE_END | 1121 | MACHINE_END |
