From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 13 Nov 2023 20:14:37 +0000 (-0800)
Subject: realtek: convert to nvmem-layout
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d1b5981038636e61f92d4b8a72493ea4c9af1feb;p=openwrt%2Fstaging%2Fblocktrron.git

realtek: convert to nvmem-layout

nvmem-cells is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/target/linux/realtek/dts-5.15/rtl8380_tplink_sg2xxx.dtsi b/target/linux/realtek/dts-5.15/rtl8380_tplink_sg2xxx.dtsi
index e727a9405a..0706c55524 100644
--- a/target/linux/realtek/dts-5.15/rtl8380_tplink_sg2xxx.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl8380_tplink_sg2xxx.dtsi
@@ -114,15 +114,18 @@
 				reg = <0x1b00000 0x400000>;
 			};
 			partition@1f00000 {
-				compatible = "nvmem-cells";
 				label = "para";
 				reg = <0x1f00000 0x100000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				factory_macaddr: macaddr@fdff4 {
-					reg = <0xfdff4 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					factory_macaddr: macaddr@fdff4 {
+						reg = <0xfdff4 0x6>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts b/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts
index 3b3b7ad2f8..6e9f7baed0 100644
--- a/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts
@@ -72,15 +72,18 @@
 				reg = <0x1b00000 0x400000>;
 			};
 			partition@1f00000 {
-				compatible = "nvmem-cells";
 				label = "para";
 				reg = <0x1f00000 0x100000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				factory_macaddr: macaddr@fdff4 {
-					reg = <0xfdff4 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					factory_macaddr: macaddr@fdff4 {
+						reg = <0xfdff4 0x6>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts b/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
index d2221c1d2f..5ca342f970 100644
--- a/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
+++ b/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
@@ -262,15 +262,18 @@
 				reg = <0x1b00000 0x400000>;
 			};
 			partition@1f00000 {
-				compatible = "nvmem-cells";
 				label = "para";
 				reg = <0x1f00000 0x100000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				factory_macaddr: macaddr@fdff4 {
-					reg = <0xfdff4 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					factory_macaddr: macaddr@fdff4 {
+						reg = <0xfdff4 0x6>;
+					};
 				};
 			};
 		};