[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240822152801.602318-6-claudiu.beznea.uj@bp.renesas.com>
Date: Thu, 22 Aug 2024 18:27:50 +0300
From: Claudiu <claudiu.beznea@...on.dev>
To: vkoul@...nel.org,
kishon@...nel.org,
robh@...nel.org,
krzk+dt@...nel.org,
conor+dt@...nel.org,
p.zabel@...gutronix.de,
geert+renesas@...der.be,
magnus.damm@...il.com,
gregkh@...uxfoundation.org,
mturquette@...libre.com,
sboyd@...nel.org,
yoshihiro.shimoda.uh@...esas.com,
biju.das.jz@...renesas.com,
ulf.hansson@...aro.org
Cc: linux-phy@...ts.infradead.org,
devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-renesas-soc@...r.kernel.org,
linux-usb@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-clk@...r.kernel.org,
linux-pm@...r.kernel.org,
claudiu.beznea@...on.dev,
Claudiu Beznea <claudiu.beznea.uj@...renesas.com>
Subject: [PATCH 05/16] soc: renesas: sysc: Move RZ/G3S SoC detection on SYSC driver
From: Claudiu Beznea <claudiu.beznea.uj@...renesas.com>
Now that we have a driver for SYSC driver for RZ/G3S move the SoC detection
for RZ/G3S in SYSC driver.
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@...renesas.com>
---
drivers/soc/renesas/renesas-soc.c | 12 ---------
drivers/soc/renesas/rzg3s-sysc.c | 45 +++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index 172d59e6fbcf..425d9037dcd0 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -71,10 +71,6 @@ static const struct renesas_family fam_rzg2ul __initconst __maybe_unused = {
.name = "RZ/G2UL",
};
-static const struct renesas_family fam_rzg3s __initconst __maybe_unused = {
- .name = "RZ/G3S",
-};
-
static const struct renesas_family fam_rzv2h __initconst __maybe_unused = {
.name = "RZ/V2H",
};
@@ -176,11 +172,6 @@ static const struct renesas_soc soc_rz_g2ul __initconst __maybe_unused = {
.id = 0x8450447,
};
-static const struct renesas_soc soc_rz_g3s __initconst __maybe_unused = {
- .family = &fam_rzg3s,
- .id = 0x85e0447,
-};
-
static const struct renesas_soc soc_rz_v2h __initconst __maybe_unused = {
.family = &fam_rzv2h,
.id = 0x847a447,
@@ -410,9 +401,6 @@ static const struct of_device_id renesas_socs[] __initconst __maybe_unused = {
#ifdef CONFIG_ARCH_R9A07G054
{ .compatible = "renesas,r9a07g054", .data = &soc_rz_v2l },
#endif
-#ifdef CONFIG_ARCH_R9A08G045
- { .compatible = "renesas,r9a08g045", .data = &soc_rz_g3s },
-#endif
#ifdef CONFIG_ARCH_R9A09G011
{ .compatible = "renesas,r9a09g011", .data = &soc_rz_v2m },
#endif
diff --git a/drivers/soc/renesas/rzg3s-sysc.c b/drivers/soc/renesas/rzg3s-sysc.c
index e664d29ce5c3..1dd48c7255d1 100644
--- a/drivers/soc/renesas/rzg3s-sysc.c
+++ b/drivers/soc/renesas/rzg3s-sysc.c
@@ -6,10 +6,16 @@
*/
#include <linux/auxiliary_bus.h>
+#include <linux/io.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/sys_soc.h>
#include <linux/soc/renesas/rzg3s-sysc-reset.h>
+#define RZG3S_SYS_LSI_DEVID 0xa04
+#define RZG3S_SYS_LSI_DEVID_REV GENMASK(31, 28)
+
/**
* struct rzg3s_sysc - SYSC private data structure
* @base: base address
@@ -71,8 +77,14 @@ static int rzg3s_sysc_reset_probe(struct rzg3s_sysc *sysc, const char *adev_name
static int rzg3s_sysc_probe(struct platform_device *pdev)
{
+ const char *soc_id_start, *soc_id_end, *compatible;
+ struct soc_device_attribute *soc_dev_attr;
struct device *dev = &pdev->dev;
+ struct soc_device *soc_dev;
struct rzg3s_sysc *sysc;
+ char soc_id[32] = {0};
+ u32 devid, revision;
+ u8 size;
sysc = devm_kzalloc(dev, sizeof(*sysc), GFP_KERNEL);
if (!sysc)
@@ -85,6 +97,39 @@ static int rzg3s_sysc_probe(struct platform_device *pdev)
sysc->dev = dev;
spin_lock_init(&sysc->lock);
+ compatible = of_get_property(dev->of_node, "compatible", NULL);
+ if (!compatible)
+ return -ENODEV;
+
+ soc_id_start = strchr(compatible, ',') + 1;
+ soc_id_end = strchr(compatible, '-');
+ size = soc_id_end - soc_id_start;
+ if (size > 32)
+ size = 32;
+ strscpy(soc_id, soc_id_start, size);
+
+ soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr), GFP_KERNEL);
+ if (!soc_dev_attr)
+ return -ENOMEM;
+
+ soc_dev_attr->family = "RZ/G3S";
+ soc_dev_attr->soc_id = devm_kstrdup(dev, soc_id, GFP_KERNEL);
+ if (!soc_dev_attr->soc_id)
+ return -ENOMEM;
+
+ devid = readl(sysc->base + RZG3S_SYS_LSI_DEVID);
+ revision = FIELD_GET(RZG3S_SYS_LSI_DEVID_REV, devid);
+ soc_dev_attr->revision = devm_kasprintf(dev, GFP_KERNEL, "%u", revision);
+ if (!soc_dev_attr->revision)
+ return -ENOMEM;
+
+ dev_info(dev, "Detected Renesas %s %s Rev %s\n", soc_dev_attr->family,
+ soc_dev_attr->soc_id, soc_dev_attr->revision);
+
+ soc_dev = soc_device_register(soc_dev_attr);
+ if (IS_ERR(soc_dev))
+ return PTR_ERR(soc_dev);
+
return rzg3s_sysc_reset_probe(sysc, "reset", 0);
}
--
2.39.2
Powered by blists - more mailing lists