diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-11-21 17:40:55 +0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2014-12-11 09:41:45 -0800 |
| commit | 73a1cb27c0d9e93d97cd7a344fd341f638ba3a2a (patch) | |
| tree | eb23effa0293214ada8f650877544efd5a18ce75 /arch/arm/cpu/armv7/nonsec_virt.S | |
| parent | b8e5c7f94af6b178946ae01ba36ac7fac1e86ec7 (diff) | |
| download | blackbird-obmc-uboot-73a1cb27c0d9e93d97cd7a344fd341f638ba3a2a.tar.gz blackbird-obmc-uboot-73a1cb27c0d9e93d97cd7a344fd341f638ba3a2a.zip | |
ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.
For some SoCs, the system clock frequency may not equal to the
ARCH Timer's frequency.
This patch uses the CONFIG_TIMER_CLK_FREQ instead of
CONFIG_SYS_CLK_FREQ, then the system clock macro and arch timer
macor could be set separately and without interfering each other.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch/arm/cpu/armv7/nonsec_virt.S')
| -rw-r--r-- | arch/arm/cpu/armv7/nonsec_virt.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 1ab5d54e30..30d81db8b8 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -169,11 +169,11 @@ ENTRY(_nonsec_init) * we do this here instead. * But first check if we have the generic timer. */ -#ifdef CONFIG_SYS_CLK_FREQ +#ifdef CONFIG_TIMER_CLK_FREQ mrc p15, 0, r0, c0, c1, 1 @ read ID_PFR1 and r0, r0, #CPUID_ARM_GENTIMER_MASK @ mask arch timer bits cmp r0, #(1 << CPUID_ARM_GENTIMER_SHIFT) - ldreq r1, =CONFIG_SYS_CLK_FREQ + ldreq r1, =CONFIG_TIMER_CLK_FREQ mcreq p15, 0, r1, c14, c0, 0 @ write CNTFRQ #endif |
