diff options
| author | Christoffer Dall <c.dall@virtualopensystems.com> | 2012-11-18 23:54:05 -0500 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-18 22:51:28 +0400 |
| commit | 6d61d00175a8481640abfae1c1640959e88fb660 (patch) | |
| tree | 0fb9ff1168709bccf630c99daef1071429ce2163 | |
| parent | da156b115a7912583324dbb0df34a6c0c20dc34f (diff) | |
ARM: SoC: Add arch timer to exynos5250
Add the arch timer node in the DT and initialize and register the arch
timers in the main exynos timer code.
Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-arndale.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mct.c | 4 |
3 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 92a6955eeb1c..dcb62d22a988 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -27,6 +27,14 @@ reg = <0x40000000 0x80000000>; }; + timer { + compatible = "arm,armv7-timer"; + interrupts = <1 13 0xf08>, + <1 14 0xf08>, + <1 11 0xf08>, + <1 10 0xf08>; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; }; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index c5115c88941d..1730e942e12d 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -23,6 +23,14 @@ reg = <0x40000000 0x80000000>; }; + timer { + compatible = "arm,armv7-timer"; + interrupts = <1 13 0xf08>, + <1 14 0xf08>, + <1 11 0xf08>, + <1 10 0xf08>; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; }; diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c index 57668eb68e75..6cb48f5d67c2 100644 --- a/arch/arm/mach-exynos/mct.c +++ b/arch/arm/mach-exynos/mct.c @@ -24,6 +24,7 @@ #include <asm/arch_timer.h> #include <asm/hardware/gic.h> #include <asm/localtimer.h> +#include <asm/arch_timer.h> #include <plat/cpu.h> @@ -493,6 +494,9 @@ static void __init exynos_timer_init(void) exynos4_timer_resources(); exynos4_clocksource_init(); exynos4_clockevent_init(); + + if (arch_timer_of_register() != 0) + pr_err("Error registering architected timers\n"); } struct sys_timer exynos4_timer = { |