From: Geert Uytterhoeven Date: Tue, 18 Jul 2017 13:30:15 +0000 (+0200) Subject: ARM: shmobile: rcar-gen2: Correct arch timer frequency on RZ/G1E X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd66fa4e0203fed9d8af6e1596ff8a68ede7fb1d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ARM: shmobile: rcar-gen2: Correct arch timer frequency on RZ/G1E According to the datasheet, the frequency of the ARM architecture timer on RZ/G1E depends on the frequency of the ZS clock, just like on R-Car E2 and V2H. Signed-off-by: Geert Uytterhoeven 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 3bd505da3172..7ab1690fab82 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -70,7 +70,8 @@ void __init rcar_gen2_timer_init(void) void __iomem *base; u32 freq; - if (of_machine_is_compatible("renesas,r8a7792") || + if (of_machine_is_compatible("renesas,r8a7745") || + 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