Browse Source

ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H

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 <geert+renesas@glider.be>
Tested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven 9 years ago
parent
commit
2477a356dd
1 changed files with 2 additions and 1 deletions
  1. 2 1
      arch/arm/mach-shmobile/setup-rcar-gen2.c

+ 2 - 1
arch/arm/mach-shmobile/setup-rcar-gen2.c

@@ -76,7 +76,8 @@ void __init rcar_gen2_timer_init(void)
 	void __iomem *base;
 	void __iomem *base;
 	u32 freq;
 	u32 freq;
 
 
-	if (of_machine_is_compatible("renesas,r8a7794")) {
+	if (of_machine_is_compatible("renesas,r8a7792") ||
+	    of_machine_is_compatible("renesas,r8a7794")) {
 		freq = 260000000 / 8;	/* ZS / 8 */
 		freq = 260000000 / 8;	/* ZS / 8 */
 		/* CNTVOFF has to be initialized either from non-secure
 		/* CNTVOFF has to be initialized either from non-secure
 		 * Hypervisor mode or secure Monitor mode with SCR.NS==1.
 		 * Hypervisor mode or secure Monitor mode with SCR.NS==1.