[U-Boot] [PATCH 1/4] ARM: fix the ARCH Timer frequency setting.

Diana Craciun
2014-07-03T11:23:45Z

On 07/03/2014 12:51 PM, Xiubo Li wrote:
> For some SoCs, the CONFIG_SYS_CLK_FREQ maybe won't equal the ARCH
> Timer's frequency.

Can you give an example?

> Here using the CONFIG_TIMER_CLK_FREQ instead if the ARCH Timer's
> frequency need to config here.
>
> Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
> ---
> arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
> index 6f90988..e9766c0 100644
> --- a/arch/arm/cpu/armv7/nonsec_virt.S
> +++ b/arch/arm/cpu/armv7/nonsec_virt.S
> @@ -147,11 +147,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

Aren't you breaking the boards which rely on CONFIG_SYS_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
>

Diana