From: Geert Uytterhoeven Date: Mon, 13 Jun 2016 10:31:12 +0000 (+0200) Subject: ARM: shmobile: rcar-gen2: Correct arch timer frequency on R-Car V2H X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2477a356dd245bbbde74c81edc5f16a6d8192023;p=linux.git 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 Tested-by: Sergei Shtylyov Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index ea092d5dd4750..afb9fdcd3d908 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 = 260000000 / 8; /* ZS / 8 */ /* CNTVOFF has to be initialized either from non-secure * Hypervisor mode or secure Monitor mode with SCR.NS==1.