From: T Karthik Reddy <t.karthik.reddy@amd.com>
Date: Wed, 20 Jul 2022 09:59:57 +0000 (-0600)
Subject: reset: zynqmp: Add reset driver support for versal
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=9df50817405b358c5dd8c669030de7b1f8b15cb8;p=u-boot.git

reset: zynqmp: Add reset driver support for versal

Add support for versal platform by adding "xlnx,versal-reset"
compatible string in zynqmp-reset driver. Reset numbering schema
for versal is not same as zynqmp, so nr_reset and reset_id are
set to zero. In case of assert/dessert, required device reset id
is sent from respective driver through struct reset_ctl.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@amd.com>
Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com>
Link: https://lore.kernel.org/r/20220720095959.29610-2-ashok.reddy.soma@xilinx.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
---

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index b57714111b..69a7b4ccba 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -199,11 +199,11 @@ config RESET_SCMI
 	  protocol communication with a SCMI server.
 
 config RESET_ZYNQMP
-	bool "Reset Driver for Xilinx ZynqMP SoC's"
+	bool "Reset Driver for Xilinx ZynqMP & Versal SoC's"
 	depends on DM_RESET && ZYNQMP_FIRMWARE
 	help
-	  Support for reset controller on Xilinx ZynqMP SoC. Driver is only
-	  passing request via Xilinx firmware interface to TF-A and PMU
+	  Support for reset controller on Xilinx ZynqMP & Versal SoC's. Driver
+	  is only passing request via Xilinx firmware interface to TF-A and PMU
 	  firmware.
 
 config RESET_DRA7
diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c
index 4e3f907980..52c08c4722 100644
--- a/drivers/reset/reset-zynqmp.c
+++ b/drivers/reset/reset-zynqmp.c
@@ -53,7 +53,7 @@ static int zynqmp_reset_request(struct reset_ctl *rst)
 	dev_dbg(rst->dev, "%s(rst=%p) (id=%lu) (nr_reset=%d)\n", __func__,
 		rst, rst->id, priv->nr_reset);
 
-	if (rst->id > priv->nr_reset)
+	if (priv->nr_reset && rst->id > priv->nr_reset)
 		return -EINVAL;
 
 	return 0;
@@ -63,8 +63,11 @@ static int zynqmp_reset_probe(struct udevice *dev)
 {
 	struct zynqmp_reset_priv *priv = dev_get_priv(dev);
 
-	priv->reset_id = ZYNQMP_RESET_ID;
-	priv->nr_reset = ZYNQMP_NR_RESETS;
+	if (device_is_compatible(dev, "xlnx,zynqmp-reset")) {
+		priv->reset_id = ZYNQMP_RESET_ID;
+		priv->nr_reset = ZYNQMP_NR_RESETS;
+	}
+
 	return 0;
 }
 
@@ -76,6 +79,7 @@ const struct reset_ops zynqmp_reset_ops = {
 
 static const struct udevice_id zynqmp_reset_ids[] = {
 	{ .compatible = "xlnx,zynqmp-reset" },
+	{ .compatible = "xlnx,versal-reset" },
 	{ }
 };