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 b443611cbb33181530ca3ff4aa86f5730c0ba0bd..ce9312f9d8286e434925efdbe48c164f96c42d19 100644 (file)
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@@ -1,9 +1,8 @@
+// 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>
@@ -12,7 +11,14 @@
 #define R8A7796_REV_1_0                0x5200
 #define R8A7796_REV_1_1                0x5210
 
-static u32 rmobile_get_prr(void);
+static u32 rmobile_get_prr(void)
+{
+#ifdef CONFIG_RCAR_GEN3
+       return readl(0xFFF00044);
+#else
+       return readl(0xFF000044);
+#endif
+}
 
 u32 rmobile_get_cpu_type(void)
 {
@@ -38,55 +44,3 @@ u32 rmobile_get_cpu_rev_fraction(void)
        else
                return prr & 0x0000000F;
 }
-
-#if !CONFIG_IS_ENABLED(DM) || !CONFIG_IS_ENABLED(SYSCON)
-static u32 rmobile_get_prr(void)
-{
-       /*
-        * On RCar/RMobile Gen2 and older systems, the PRR is always
-        * located at the address below. On newer systems, the PRR
-        * may be located at different address, but that information
-        * is obtained from DT. This code will be removed when all
-        * of the older systems get converted to DM and OF control.
-        */
-       return readl(0xFF000044);
-}
-#else
-
-#include <dm.h>
-#include <syscon.h>
-#include <regmap.h>
-
-struct renesas_prr_priv {
-       fdt_addr_t      regs;
-};
-
-enum {
-       PRR_RCAR,
-};
-
-static u32 rmobile_get_prr(void)
-{
-       struct regmap *map;
-
-       map = syscon_get_regmap_by_driver_data(PRR_RCAR);
-       if (!map) {
-               printf("PRR regmap failed!\n");
-               hang();
-       }
-
-       return readl(map->base);
-}
-
-static const struct udevice_id renesas_prr_ids[] = {
-       { .compatible = "renesas,prr", .data = PRR_RCAR },
-       { }
-};
-
-U_BOOT_DRIVER(renesas_prr) = {
-       .name   = "renesas_prr",
-       .id     = UCLASS_SYSCON,
-       .of_match = renesas_prr_ids,
-       .flags  = DM_FLAG_PRE_RELOC,
-};
-#endif