[openwrt/openwrt] ramips: use fixed layout cell "mac-base" for Netgear R6220

[LEDE Commits]

rmilecki pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f1492fcc091cc5f46cdc4b4fb09eccbbf1b3953b

commit f1492fcc091cc5f46cdc4b4fb09eccbbf1b3953b
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Fri Jul 14 10:27:54 2023 +0200

    ramips: use fixed layout cell "mac-base" for Netgear R6220
    
    This drops a use of downstream "mac-address-increment".
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 target/linux/ramips/dts/mt7621_netgear_r6220.dts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_netgear_r6220.dts b/target/linux/ramips/dts/mt7621_netgear_r6220.dts
index 7bb49c15b4..146b7ee752 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6220.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6220.dts
@@ -47,11 +47,16 @@
 			reg = <0x2e00000 0x100000>;
 			read-only;
 
-			#address-cells = <1>;
-			#size-cells = <1>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr at 4 {
-				reg = <0x4 0x6>;
+				macaddr_factory_4: macaddr at 4 {
+					compatible = "mac-base";
+					reg = <0x4 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
 			};
 		};
 
@@ -64,12 +69,11 @@
 };
 
 &gmac0 {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 0>;
 	nvmem-cell-names = "mac-address";
 };
 
 &gmac1 {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <1>;
 };