[v2,16/29] soc: realtek: chip: Detect RTD1392

Commit Message

Andreas Färber June 23, 2020, 2:50 a.m. UTC

From: Stanley Chang <[e-mail]>

Distinguish RTD1392 from RTD1395 via ISO_CHIP_INFO1 register.

Signed-off-by: Stanley Chang <[e-mail]>
Signed-off-by: Andreas Färber <[e-mail]>
---
 TODO: Name the bit in ISO_CHIP_INFO1:bound_opts.
 
 Note: We don't have any RTD1392 .dtsi/.dts yet.
 
 v2: New
 * Split out from Stanley's v1
 
 drivers/soc/realtek/chip.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

Comments

Stanley Chang[昌育德] July 10, 2020, 8:05 a.m. UTC | #1

Hi Andreas,


> -----Original Message-----
> From: Andreas Färber [mailto:[e-mail]]
> Sent: Tuesday, June 23, 2020 10:51 AM
> To: [e-mail]
> Cc: [e-mail]; [e-mail]; James
> Tai [戴志峰]; Stanley Chang[昌育德]; Edgar Lee [李承諭]; Andreas Färber
> Subject: [PATCH v2 16/29] soc: realtek: chip: Detect RTD1392
> 
> From: Stanley Chang <[e-mail]>
> 
> Distinguish RTD1392 from RTD1395 via ISO_CHIP_INFO1 register.
> 
> Signed-off-by: Stanley Chang <[e-mail]>
> Signed-off-by: Andreas Färber <[e-mail]>



Reviewed-by: Stanley Chang <[e-mail]>

Thanks,
Stanley

Patch

diff --git a/drivers/soc/realtek/chip.c b/drivers/soc/realtek/chip.c
index 6b3d1f3d3816..9cee760bac35 100644
--- a/drivers/soc/realtek/chip.c
+++ b/drivers/soc/realtek/chip.c
@@ -107,10 +107,33 @@  static const char *rtd1295_name(struct device *dev, const struct dhc_soc *s)
 	return "RTD1295";
 }
 
+static const char *rtd1395_name(struct device *dev, const struct dhc_soc *s)
+{
+	struct regmap *regmap;
+	unsigned int val;
+	int ret;
+
+	regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "iso-syscon");
+	if (IS_ERR(regmap)) {
+		ret = PTR_ERR(regmap);
+		if (ret == -EPROBE_DEFER)
+			return ERR_PTR(ret);
+		dev_warn(dev, "Could not check iso (%d)\n", ret);
+	} else {
+		ret = regmap_read(regmap, REG_ISO_CHIP_INFO1, &val);
+		if (ret)
+			dev_warn(dev, "Could not read chip_info1 (%d)\n", ret);
+		else if (val & BIT(12))
+			return "RTD1392";
+	}
+
+	return "RTD1395";
+}
+
 static const struct dhc_soc dhc_soc_families[] = {
 	{ 0x6329, "RTD1195", default_name, rtd1195_revisions, "Phoenix" },
 	{ 0x6421, "RTD1295", rtd1295_name, rtd1295_revisions, "Kylin" },
-	{ 0x6481, "RTD1395", default_name, rtd1395_revisions, "Hercules" },
+	{ 0x6481, "RTD1395", rtd1395_name, rtd1395_revisions, "Hercules" },
 	{ 0x6525, "RTD1619", default_name, rtd1619_revisions, "Thor" },
 	{ 0x6570, "RTD1319", default_name, rtd1319_revisions, "Hank" },
 };