Merge tag 'u-boot-amlogic-20181207' of git://git.denx.de/u-boot-amlogic

[oweals/u-boot.git] / arch / arm / mach-rmobile / cpu_info-rcar.c

diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index c373eef73d46244b6f8ecb2898af809f4a1e457d..ce9312f9d8286e434925efdbe48c164f96c42d19 100644 (file)
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@@ -1,26 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/cpu/armv7/rmobile/cpu_info-rcar.c
  *
  * Copyright (C) 2013,2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
  */
 #include <common.h>
 #include <asm/io.h>
 
-#define PRR                    0xFF000044
 #define PRR_MASK               0x7fff
 #define R8A7796_REV_1_0                0x5200
 #define R8A7796_REV_1_1                0x5210
 
+static u32 rmobile_get_prr(void)
+{
+#ifdef CONFIG_RCAR_GEN3
+       return readl(0xFFF00044);
+#else
+       return readl(0xFF000044);
+#endif
+}
+
 u32 rmobile_get_cpu_type(void)
 {
-       return (readl(PRR) & 0x00007F00) >> 8;
+       return (rmobile_get_prr() & 0x00007F00) >> 8;
 }
 
 u32 rmobile_get_cpu_rev_integer(void)
 {
-       const u32 prr = readl(PRR);
+       const u32 prr = rmobile_get_prr();
 
        if ((prr & PRR_MASK) == R8A7796_REV_1_1)
                return 1;
@@ -30,7 +37,7 @@ u32 rmobile_get_cpu_rev_integer(void)
 
 u32 rmobile_get_cpu_rev_fraction(void)
 {
-       const u32 prr = readl(PRR);
+       const u32 prr = rmobile_get_prr();
 
        if ((prr & PRR_MASK) == R8A7796_REV_1_1)
                return 1;