From aff151e5b278cbe12f4383e42d271b982bdc60d7 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Thu, 9 Nov 2017 21:49:48 +0100
Subject: [PATCH] ARM: rmobile: Convert PRR to DM and OF control

Implement DM driver for the Renesas PRR into RCar cpu info and convert
all users with DM and OF enabled to this new driver. This means all of
the boards with DM and OF enabled can fetch PRR address from DT, which
is useful on ie. V3M which has different PRR address than the rest of
Gen3 SoCs.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 arch/arm/mach-rmobile/cpu_info-rcar.c | 61 +++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index c373eef73d..b443611cbb 100644
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@@ -8,19 +8,20 @@
 #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);
+
 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,10 +31,62 @@ 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;
 	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
-- 
2.39.5