From: Michal Simek <michal.simek@amd.com>
Date: Mon, 27 May 2024 09:34:07 +0000 (+0200)
Subject: arm64: zynqmp: Align nvmem node with dt schema
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b2774d0292e875861c70ea75dc3baf88d4cec1ad;p=users%2Fwilly%2Flinux.git

arm64: zynqmp: Align nvmem node with dt schema

Use new soc-nvmem node name and swich to nvmem fixed layout.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/7796804c7c7dd8bb2c93bdfe028c22746a24fe54.1716802450.git.michal.simek@amd.com
---

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 95796d6b5515..cb74d1ffb825 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -207,13 +207,16 @@
 				mbox-names = "tx", "rx";
 			};
 
-			nvmem-firmware {
+			soc-nvmem {
 				compatible = "xlnx,zynqmp-nvmem-fw";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				soc_revision: soc-revision@0 {
-					reg = <0x0 0x4>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					soc_revision: soc-revision@0 {
+						reg = <0x0 0x4>;
+					};
 				};
 			};