ipq40xx: remove mac-address-increment

nvmem-layout allows removal

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

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts
index 466185e36b8fdc842bb5ab73a0ad25ea5127e7f7..a646ec3358f2b29c5b9d9de04728b2ddc55a9316 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts
@@ -183,7 +183,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_gmac0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_gmac1: macaddr@6 {
@@ -305,8 +307,7 @@
 
        label = "lan2";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_gmac0 2>;
 };
 
 &swport4 {
@@ -314,7 +315,7 @@
 
        label = "lan1";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
+       nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &swport5 {

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
index 02bdeaa5244d075fbf2114e7ba1ab460178a9140..fc4bae6937fb7aa2f5999225681d8b3a57885bcb 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
@@ -143,7 +143,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mac_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
index 52272434679cbff1cfb416810af37c30b3a7f3e3..a688a8aa58664eda7c7f3d0d681990f847891856 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
@@ -129,8 +129,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_mac_0 2>;
 };
 
 &switch {
@@ -180,12 +179,11 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 0>;
 };
 
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 1>;
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
index 5dd7e03eccaf9178af11c124a020aa675623ee73..8eb8ce85036ef9801aff161579f4becea304c7f9 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
@@ -143,7 +143,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mac_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
index d6eaaceef33660c386d2496f8362069dce58b1b5..b4b9451cb2c1e03b60cae546f591836bea22da60 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
@@ -160,7 +160,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mac_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
index 11015f543e5dd904c9af80855b338772fca5a3f3..ae0d8524e5216f2197e6016d69df33e1287773e9 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
@@ -270,7 +270,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_manudata_6: macaddr@6 {
+                                               compatible = "mac-base";
                                                reg = <0x6 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -373,14 +375,13 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_manudata_6>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_manudata_6 0>;
        qcom,ath10k-calibration-variant = "Netgear-WAC510";
 };
 
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_manudata_6>;
-       mac-address-increment = <16>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_manudata_6 16>;
        qcom,ath10k-calibration-variant = "Netgear-WAC510";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
index a9d7b51b3d18428a9f74f1a283dcfd1833ded0ef..1b1a697f13b029a08c161afb20317e85e3a0dd8f 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
@@ -238,7 +238,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &switch {
@@ -251,8 +251,7 @@
        label = "wan";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_config_0 1>;
 };
 
 &swport3 {
@@ -309,7 +308,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -457,8 +458,7 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
        qcom,ath10k-calibration-variant = "ZTE-MF18A";
 };
 
@@ -478,8 +478,7 @@
                wifi2: wifi@1,0 {
                        compatible = "pci168c,0040";
                        nvmem-cell-names = "pre-calibration", "mac-address";
-                       nvmem-cells = <&precal_art_9000>, <&macaddr_config_0>;
-                       mac-address-increment = <3>;
+                       nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;
                        qcom,ath10k-calibration-variant = "ZTE-MF18A";
                        reg = <0x00010000 0 0 0 0>;
                };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf282plus.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf282plus.dts
index 7566d4bfe180f460018bc5deba73094607304b90..54353cac58e7d71e468208931c9660c6ea26fe0a 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf282plus.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf282plus.dts
@@ -223,7 +223,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &nand {
@@ -274,7 +274,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -436,8 +438,7 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 1>;
        qcom,ath10k-calibration-variant = "zte,mf286d";
 };
 
@@ -448,7 +449,6 @@
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_config_0 1>;
        qcom,ath10k-calibration-variant = "zte,mf286d";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
index a5755d1c1bac15f33aa821c561b66c4a1f8418b7..61cbdba0d12a8b815b49bdd814f2e3c0379f04b5 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
@@ -216,7 +216,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &nand {
@@ -267,7 +267,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -353,8 +355,7 @@
        status = "okay";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_config_0 1>;
 };
 
 &tlmm {
@@ -440,15 +441,13 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
        qcom,ath10k-calibration-variant = "zte,mf286d";
 };
 
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>;
-       mac-address-increment = <3>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_config_0 3>;
        qcom,ath10k-calibration-variant = "zte,mf286d";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
index 2e66f98f65450eb945198742c4615285919d8922..bbb2cb902a2e5c4b3020ec10f55ce2a0d88e9ce4 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
@@ -243,7 +243,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mac_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -316,7 +318,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0>;
+       nvmem-cells = <&macaddr_mac_0 0>;
 };
 
 &switch {
@@ -329,8 +331,7 @@
        label = "wan";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_mac_0 1>;
 };
 
 &swport5 {
@@ -407,8 +408,7 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 2>;
        qcom,ath10k-calibration-variant = "zte,mf289f";
 };
 
@@ -416,8 +416,7 @@
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>;
-       mac-address-increment = <3>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 3>;
        qcom,ath10k-calibration-variant = "zte,mf289f";
 };
 
@@ -436,8 +435,7 @@
 
                wifi2: wifi@1,0 {
                        nvmem-cell-names = "mac-address";
-                       nvmem-cells = <&macaddr_mac_0>;
-                       mac-address-increment = <4>;
+                       nvmem-cells = <&macaddr_mac_0 4>;
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
                        qcom,ath10k-calibration-variant = "zte,mf289f";

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
index 60a88c1741882b68358202704adabd1357e086d4..963c0915bb37125a14b8930dac5adb5fb32a834a 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
@@ -362,7 +362,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_gmac0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_gmac1: macaddr@6 {
@@ -479,7 +481,7 @@
        label = "wan";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
+       nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &wifi0 {
@@ -495,8 +497,7 @@
        qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0 1>;
 };
 
 &wifi1 {
@@ -506,8 +507,7 @@
        qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0 2>;
 };
 
 &wifi2 {
@@ -517,6 +517,5 @@
        qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>;
-       mac-address-increment = <3>;
+       nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0 3>;
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
index e817c1b4672878d694dcffa0e6386e819df1a25f..7e484db1b5c9c9f66183dcae1db1b883558081b9 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
@@ -151,7 +151,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mfginfo_1d: macaddr@1d {
+                                               compatible = "mac-base";
                                                reg = <0x1d 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
index 4afb7ed331c4130f335e6bb751b1f30faa0e0c72..41b42e8f58fbb5de3cdfd72196c07c658022f661 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
@@ -366,7 +366,9 @@
                                        };
 
                                        macaddr_mfginfo_45: macaddr@45 {
+                                               compatible = "mac-base";
                                                reg = <0x45 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -465,14 +467,13 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45 0>;
        qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };
 
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45 1>;
        qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
index 57de0899118ef4565c32ca3d4627bafd18c73ada..3477dace7274242d07c6ab207c5e77e5841e2ba3 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
@@ -195,7 +195,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mfginfo_1d: macaddr@1d {
+                                               compatible = "mac-base";
                                                reg = <0x1d 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
index 41de6bb218b925a73e3aeb5e2298194d24153d73..4b3b682260e3568566f6461ee851f02ff1da1444 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
@@ -259,14 +259,13 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d 0>;
        qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };
 
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d 1>;
        qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index e963e3b415a80bcd5c91606889d78a4bae05e2a5..9694973132f5eae700ed5ffa21a09bbb1fad79ed 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -202,7 +202,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_gmac0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_gmac1: macaddr@6 {
@@ -291,8 +293,7 @@
 
        label = "lan2";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_gmac0 2>;
 };
 
 &swport4 {
@@ -300,7 +301,7 @@
 
        label = "lan1";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_gmac0>;
+       nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &swport5 {

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
index ebfab171f51cc4e39879a8a88dcbbb62a491cca6..dbf6c14b7246d5b64137304072b7ab10c55e8b38 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
@@ -137,7 +137,9 @@
                #size-cells = <1>;
 
                mac_address: mac-address@66 {
+                       compatible = "mac-base";
                        reg = <0x66 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
        };
 };
@@ -284,9 +286,8 @@
                        compatible = "qcom,ath10k";
                        status = "okay";
                        reg = <0x00010000 0 0 0 0>;
-                       nvmem-cells = <&mac_address>;
+                       nvmem-cells = <&mac_address 1>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <1>;
                };
        };
 };
@@ -390,22 +391,20 @@
 &wifi0 {
        status = "okay";
        qcom,ath10k-calibration-variant = "Meraki-MR33";
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &wifi1 {
        status = "okay";
        qcom,ath10k-calibration-variant = "Meraki-MR33";
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 3>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <3>;
 };
 
 &gmac {
        status = "okay";
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 0>;
        nvmem-cell-names = "mac-address";
 };