Re: [PATCH/RFC] ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H

[Sergei Shtylyov]

On 06/16/2016 08:19 AM, Simon Horman wrote:


According to the datasheet, the frequency of the ARM architecture timer
on R-Car V2H depends on the frequency of the ZS clock, just like on
R-Car E2.

Signed-off-by: Geert Uytterhoeven 
---
Against renesas-devel-20160613-v4.7-rc3 with "ARM: shmobile: rcar-gen2:
Obtain extal frequency from DT" applied.

Untested due to lack of hardware.


Sergei, could you test this?


   Done, now 'sleep 5' takes 5 seconds indeed. :-)

Tested-by: Sergei Shtylyov 

MBR, Sergei

Re: [PATCH/RFC] ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H

[Simon Horman]

On Mon, Jun 13, 2016 at 12:31:12PM +0200, Geert Uytterhoeven wrote:
> According to the datasheet, the frequency of the ARM architecture timer
> on R-Car V2H depends on the frequency of the ZS clock, just like on
> R-Car E2.
> 
> Signed-off-by: Geert Uytterhoeven 
> ---
> Against renesas-devel-20160613-v4.7-rc3 with "ARM: shmobile: rcar-gen2:
> Obtain extal frequency from DT" applied.
> 
> Untested due to lack of hardware.

Sergei, could you test this?

> ---
>  arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c 
> b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index ea092d5dd475042d..afb9fdcd3d9084e2 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -76,7 +76,8 @@ void __init rcar_gen2_timer_init(void)
>   void __iomem *base;
>   u32 freq;
>  
> - if (of_machine_is_compatible("renesas,r8a7794")) {
> + if (of_machine_is_compatible("renesas,r8a7792") ||
> + of_machine_is_compatible("renesas,r8a7794")) {
>   freq = 26000 / 8;   /* ZS / 8 */
>   /* CNTVOFF has to be initialized either from non-secure
>* Hypervisor mode or secure Monitor mode with SCR.NS==1.
> -- 
> 1.9.1
> 

[PATCH/RFC] ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H

[Geert Uytterhoeven]

According to the datasheet, the frequency of the ARM architecture timer
on R-Car V2H depends on the frequency of the ZS clock, just like on
R-Car E2.

Signed-off-by: Geert Uytterhoeven 
---
Against renesas-devel-20160613-v4.7-rc3 with "ARM: shmobile: rcar-gen2:
Obtain extal frequency from DT" applied.

Untested due to lack of hardware.
---
 arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c 
b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index ea092d5dd475042d..afb9fdcd3d9084e2 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -76,7 +76,8 @@ void __init rcar_gen2_timer_init(void)
void __iomem *base;
u32 freq;
 
-   if (of_machine_is_compatible("renesas,r8a7794")) {
+   if (of_machine_is_compatible("renesas,r8a7792") ||
+   of_machine_is_compatible("renesas,r8a7794")) {
freq = 26000 / 8;   /* ZS / 8 */
/* CNTVOFF has to be initialized either from non-secure
 * Hypervisor mode or secure Monitor mode with SCR.NS==1.
-- 
1.9.1