ARM: tegra: clk_m is the architected timer source clock

[platform/kernel/u-boot.git] / arch / arm / mach-tegra / tegra210 / clock.c

diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 146bb64..6d75d37 100644 (file)
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -1014,13 +1014,11 @@ void arch_timer_init(void)
        struct sysctr_ctlr *sysctr = (struct sysctr_ctlr *)NV_PA_TSC_BASE;
        u32 freq, val;
 
-       freq = clock_get_rate(CLOCK_ID_OSC);
-       debug("%s: osc freq is %dHz [0x%08X]\n", __func__, freq, freq);
+       freq = clock_get_rate(CLOCK_ID_CLK_M);
+       debug("%s: clk_m freq is %dHz [0x%08X]\n", __func__, freq, freq);
 
-       /* ARM CNTFRQ */
-#ifndef CONFIG_ARM64
-       asm("mcr p15, 0, %0, c14, c0, 0\n" : : "r" (freq));
-#endif
+       if (current_el() == 3)
+               asm("msr cntfrq_el0, %0\n" : : "r" (freq));
 
        /* Only Tegra114+ has the System Counter regs */
        debug("%s: setting CNTFID0 to 0x%08X\n", __func__, freq);