[U-Boot] [PATCHv4 respin 2/6] ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.

[U-Boot] [PATCHv4 respin 2/6] ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.

[Xiubo Li]

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>
---

Hi Albert,

I there is one mistake about the CONFIG_TIMER_CLK_FREQ defination for
sun7i platform.

So i respin this patch separately.

Thanks,

BRs
Xiubo



 arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
 include/configs/sun7i.h          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 1ab5d54..30d81db 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
 
diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index ea40790..368d527 100644
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -28,6 +28,7 @@
 #define CONFIG_ARMV7_PSCI_NR_CPUS	2
 #define CONFIG_ARMV7_SECURE_BASE	SUNXI_SRAM_B_BASE
 #define CONFIG_SYS_CLK_FREQ		24000000
+#define CONFIG_TIMER_CLK_FREQ		CONFIG_SYS_CLK_FREQ
 
 /*
  * Include common sunxi configuration where most the settings are
-- 
2.1.0.27.g96db324

[U-Boot] [PATCHv4 respin 2/6] ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.

[York Sun]

On 11/23/2014 06:44 PM, Xiubo Li wrote:
> 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>
> ---
> 
> Hi Albert,
> 
> I there is one mistake about the CONFIG_TIMER_CLK_FREQ defination for
> sun7i platform.
> 
> So i respin this patch separately.
> 
> Thanks,
> 
> BRs
> Xiubo
> 

I will have to merge the difference as a separated commit. Missed this one
because it wasn't assigned to me.

York

[U-Boot] [PATCHv4 respin 2/6] ARM: HYP/non-sec: Fix the ARCH Timer frequency setting.

[York Sun]

On 12/11/2014 11:39 AM, York Sun wrote:
> On 11/23/2014 06:44 PM, Xiubo Li wrote:
>> 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>
>> ---
>>
>> Hi Albert,
>>
>> I there is one mistake about the CONFIG_TIMER_CLK_FREQ defination for
>> sun7i platform.
>>
>> So i respin this patch separately.
>>
>> Thanks,
>>
>> BRs
>> Xiubo
>>
> 
> I will have to merge the difference as a separated commit. Missed this one
> because it wasn't assigned to me.
> 

The difference is applied to u-boot-fsl-qoriq master as

ARM: HYP/non-sec: Fix the ARCH Timer frequency setting for sun7i

Awaiting upstream.

York