diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-06-13 12:31:12 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-06-29 14:42:03 +0200 |
| commit | 2477a356dd245bbbde74c81edc5f16a6d8192023 (patch) | |
| tree | 5cdca1e3fe61d4a1022b196fe9aa68a9020c2756 /arch/arm/mach-shmobile | |
| parent | ARM: shmobile: rcar-gen2: Obtain extal frequency from DT (diff) | |
| download | linux-2477a356dd245bbbde74c81edc5f16a6d8192023.tar.xz linux-2477a356dd245bbbde74c81edc5f16a6d8192023.zip | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index ea092d5dd475..afb9fdcd3d90 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. |