diff options
Diffstat (limited to 'arch/arm/mach-exynos/mct.c')
-rw-r--r-- | arch/arm/mach-exynos/mct.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c index b601fb8a408b..57668eb68e75 100644 --- a/arch/arm/mach-exynos/mct.c +++ b/arch/arm/mach-exynos/mct.c | |||
@@ -19,7 +19,9 @@ | |||
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/percpu.h> | 21 | #include <linux/percpu.h> |
22 | #include <linux/of.h> | ||
22 | 23 | ||
24 | #include <asm/arch_timer.h> | ||
23 | #include <asm/hardware/gic.h> | 25 | #include <asm/hardware/gic.h> |
24 | #include <asm/localtimer.h> | 26 | #include <asm/localtimer.h> |
25 | 27 | ||
@@ -476,8 +478,13 @@ static void __init exynos4_timer_resources(void) | |||
476 | #endif /* CONFIG_LOCAL_TIMERS */ | 478 | #endif /* CONFIG_LOCAL_TIMERS */ |
477 | } | 479 | } |
478 | 480 | ||
479 | static void __init exynos4_timer_init(void) | 481 | static void __init exynos_timer_init(void) |
480 | { | 482 | { |
483 | if (soc_is_exynos5440()) { | ||
484 | arch_timer_of_register(); | ||
485 | return; | ||
486 | } | ||
487 | |||
481 | if ((soc_is_exynos4210()) || (soc_is_exynos5250())) | 488 | if ((soc_is_exynos4210()) || (soc_is_exynos5250())) |
482 | mct_int_type = MCT_INT_SPI; | 489 | mct_int_type = MCT_INT_SPI; |
483 | else | 490 | else |
@@ -489,5 +496,5 @@ static void __init exynos4_timer_init(void) | |||
489 | } | 496 | } |
490 | 497 | ||
491 | struct sys_timer exynos4_timer = { | 498 | struct sys_timer exynos4_timer = { |
492 | .init = exynos4_timer_init, | 499 | .init = exynos_timer_init, |
493 | }; | 500 | }; |