ath79: qca: remove mac-address-increment

nvmem-layout allows removal

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

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
index 8759198f532808a11a2a0cd4705f3c1a16a50b9f..c9cd7038a5d90d5526dec308b1a682c387716eb9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
@@ -106,15 +106,13 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts b/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
index e9e19f9d3287e346eebec68733577699251bf5b4..52a6b5431f3c86b5beb1af2ec0b40674227ed423 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
@@ -45,9 +45,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &eth1 {

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
index 6af8d3b8b526feeb663ca0aed948109717ee558d..943731e69eb8d33ca584babc5b4338b45847112f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
@@ -50,9 +50,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &eth1 {
@@ -60,9 +59,8 @@
         * (GMAC0 -> eth0, GMAC1 -> eth1, same as in old ar71xx target) */
        compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &gpio_export {

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
index c2e8f0b16256683ee721fd4dfb901fd4c2947a5d..13a2e28619c87e1f296da854334ce95a99857123 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
@@ -97,7 +97,9 @@
                                        };
 
                                        macaddr_art_1002: macaddr@1002 {
+                                               compatible = "mac-base";
                                                reg = <0x1002 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -122,6 +124,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
        nvmem-cell-names = "calibration", "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_tube-2hq.dts b/target/linux/ath79/dts/qca9531_alfa-network_tube-2hq.dts
index f81fe287dfecacfe8c1bc64f8615ecc905e3e482..9b35e471e5922f96f334d10839c894e1f69a7504 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_tube-2hq.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_tube-2hq.dts
@@ -46,10 +46,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-1)>;
        nvmem-cell-names = "mac-address";
-
-       mac-address-increment = <(-1)>;
 };
 
 &eth1 {

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 5a441b551dc6afa246ae995b536e6bfb954f8a5a..a316c48c5b4804b2ddabf6327a54a4d2f0956d5e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -110,7 +110,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -153,13 +155,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -167,7 +168,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 10>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <10>;
 };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index 54cc9b2fa0584468edfc1799a9029a8d27a28745..f725ab1faa29288442a59f45fe09cd9878d103b1 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -94,7 +94,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -119,13 +121,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -133,7 +134,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 3>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <3>;
 };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
index 94adf258cb99e7edea9e3351a984508ac0b6c5a9..ba33ee9a92307efeba2f609f6f6cf6732b9e9c74 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -94,7 +94,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -119,7 +121,7 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -132,7 +134,6 @@
 
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 10>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <10>;
 };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index b7b663c8c2b5bb54fca99db8fc81afac42fc075a..652ffb9c698b810faf1e07f4b85f7f17136c5e94 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -121,7 +121,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -164,14 +166,13 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index ed3ab2a2d0ac1e38b366ffdf4bddb8c4d1566902..1c6dcee8bf857829fd4cb0d46e20471580b6c85e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -120,7 +120,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -139,14 +141,13 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
index 5810a63574729945d021fe7ea73e63681ccfb1c0..104ed3c72df44c5306f696f6d1f25073929b3a66 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
@@ -115,7 +115,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -133,16 +135,15 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&swphy4>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index ae5373a37a6a3c5edb06963f48788c89bbe77db8..3f1ad22a764a4163b9234089a591c7c5e4bf6f4f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -102,7 +102,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -121,14 +123,13 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
index d0dfccd12c723f120be35a8b1a616b1571568176..37830c4f7d048446fb03ec450f5121c8b9c0df7d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
@@ -115,7 +115,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -155,14 +157,13 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
index d718f7501b5043a23acbf14e92e9ba11125aec61..04becd63c1013c71522ac8f56f9df4bdec687703 100644 (file)
--- a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
+++ b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
@@ -86,7 +86,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_pridata_400: macaddr@400 {
+                                               compatible = "mac-base";
                                                reg = <0x400 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -105,13 +107,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/qca9531_teltonika_rut300.dts b/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
index 4954d35537fb086ea76f0021f0b9cc0f23c0aa14..f01bcafbad333c4cceb606c6b1c4562ba919cf59 100644 (file)
--- a/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
+++ b/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
@@ -91,7 +91,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -132,14 +134,13 @@
        status = "okay";
        phy-handle = <&swphy0>;
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        phy-handle = <&swphy4>;
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
        nvmem-cell-names = "mac-address";
 
        gmac-config {

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 887b8ef8161f856b598324006e3b191bc1831569..fb594f78c06d7170a02ee2a34b2fdc0b81e37985 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -131,7 +131,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_romfile_f100: macaddr@f100 {
+                                               compatible = "mac-base";
                                                reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -156,13 +158,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cells = <&macaddr_romfile_f100 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cells = <&macaddr_romfile_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -170,7 +171,7 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cells = <&macaddr_romfile_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index e8e1468ae194b8c1daf21cd99a83f5d91fb13ee4..f288317c2c374fb4283763543e115c4c09f27dbf 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -156,7 +156,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -181,13 +183,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -195,7 +196,7 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index b1acb0b22bbbc407575819cc06fc656a330a8ae9..76f12887386c4228064d6cebc183a0396cb8da49 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -113,7 +113,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -138,22 +140,20 @@
 
        phy-handle = <&swphy0>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index 9d408cddfa74e2841bba321d5e66d3992234d040..048099e2604d63dbae1faa61c0895e3063dbb19f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -132,7 +132,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -157,9 +159,8 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
@@ -170,7 +171,7 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/qca9533_kuwfi_c910.dts b/target/linux/ath79/dts/qca9533_kuwfi_c910.dts
index b42915dd332d8af8f8399c423116a500a49fe78c..487bbf9d4c70819fcfc64357f11e22bcb9f1c184 100644 (file)
--- a/target/linux/ath79/dts/qca9533_kuwfi_c910.dts
+++ b/target/linux/ath79/dts/qca9533_kuwfi_c910.dts
@@ -150,7 +150,9 @@
                                        };
 
                                        macaddr_art_1002: macaddr@1002 {
+                                               compatible = "mac-base";
                                                reg = <0x1002 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -171,15 +173,14 @@
 
        phy-handle = <&swphy0>;
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 0>;
        nvmem-cell-names = "mac-address";
 
        gmac-config {

diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
index f2a3a67b1e5cc1bcbe466be2386a51e61b622c67..1f3bf68f69c5932523fc5db725cd18f2854af31b 100644 (file)
--- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
+++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
@@ -129,7 +129,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -146,7 +148,7 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -164,7 +166,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };

diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
index dfd7e18d819f0ec73cdfa2a6da687ba68e914baf..66ede5554d0839631b7251e36fbba4b440185c5f 100644 (file)
--- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
+++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
@@ -111,7 +111,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -124,7 +126,7 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -134,16 +136,14 @@
         */
        compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index 520cc1b9e04585abbcc3fa8bffbade0ebac2d89a..b2d525acb704ce1cb2317f63ece8ceeca7e43bee 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -58,7 +58,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -83,9 +85,8 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
@@ -96,6 +97,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index 13d415e16d08bbe61c1ccd5f9487e65357581d5d..c0e23f6d62e4f1c6f6812abcf4337811d8cd04c5 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -93,7 +93,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -118,13 +120,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -132,6 +133,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
index ba326ee61a612a066d3fa790a6734219efb7be94..c11f11ae185255cbff9e953b3fe4d74e108c12c4 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
@@ -115,7 +115,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -140,13 +142,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -154,6 +155,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index 1262e3fe12419ffe046bf8774df601944a282260..33234fcb9f7a79d4f7cf2297287e044c3ebc7eef 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -126,7 +126,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -151,13 +153,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -165,6 +166,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index b9045a3e5f4f261d3690ffd480b82a08a1109f9b..e3b35b810d6397f95712dfb303999bda02fcd865 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -75,7 +75,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -100,13 +102,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -114,6 +115,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
index 69f351ac5063d306a4e26188afa0b6c17747b5b7..6d402df13f922b3e7fed93269ef92fb030929da6 100644 (file)
--- a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
+++ b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
@@ -66,7 +66,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -85,7 +87,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
@@ -99,9 +101,8 @@
 
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi b/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi
index c00b8184b4ff89f6aa7b4dbb22e8f2717cb423a4..31d86b1cf07f93464d46fc3cbdeae81ce2cdf39d 100644 (file)
--- a/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi
+++ b/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi
@@ -108,7 +108,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        cal_art_1000: cal@1000 {
@@ -156,18 +158,16 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               nvmem-cells = <&macaddr_art_0>, <&cal_art_5000>;
+               nvmem-cells = <&macaddr_art_0 4>, <&cal_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <4>;
        };
 };
 
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>;
+       nvmem-cells = <&macaddr_art_0 3>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <3>;
 };
 
 &usb_phy0 {
@@ -198,9 +198,8 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
        phy-handle = <&phy0>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
 

diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 47f66f122237b4c1c17b465d134c7bff299fac91..da159caa20cc26397788862967175b7470d1aad1 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
@@ -68,7 +68,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
 
                        calibration_art_1000: calibration@1000 {
@@ -95,7 +97,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
@@ -107,17 +109,15 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <1>;
 };
 
 &ath10k_0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+       nvmem-cells = <&macaddr_art_0 2>, <&calibration_art_5000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <2>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
index 0c64f9952290f40fdd7ca3b144c485bebc9988f7..154744afd51767286f6630a2b1a2690db39ff0b3 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
@@ -72,7 +72,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -98,7 +100,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy1>;
@@ -110,9 +112,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        phy-handle = <&phy2>;
 

diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
index 34e0e44e47b396dcb5bbbc90b77078002ff34ca4..a6197fd25ae3d4ee0a1cbc3b20b18ad013eb2a9f 100644 (file)
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -90,7 +90,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -100,9 +102,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
index c51fbc56535c4ec09a589ecae65ada58c7efce6a..81a9e6ca086357e7f34dfe273acc9cd42ce5996d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
+++ b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
@@ -75,7 +75,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
@@ -88,9 +88,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie0 {
@@ -104,7 +103,9 @@
                #size-cells = <1>;
 
                macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
                        reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
index 37d0f0b268517149f77ae5cf807f71d8d83ca141..c15cb677b9f05e8385ea581ce547d443c46a52b8 100644 (file)
--- a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
+++ b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
@@ -97,10 +97,8 @@
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
 
-               nvmem-cells = <&macaddr_oemdata_1d>;
+               nvmem-cells = <&macaddr_oemdata_1d 1>;
                nvmem-cell-names = "mac-address";
-
-               mac-address-increment = <1>;
        };
 };
 
@@ -171,7 +169,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_oemdata_1d: macaddr@1d {
+                                               compatible = "mac-base";
                                                reg = <0x1d 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -188,7 +188,7 @@
        status = "okay";
 
        qca,no-eeprom;
-       nvmem-cells = <&macaddr_oemdata_1d>;
+       nvmem-cells = <&macaddr_oemdata_1d 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -210,7 +210,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_oemdata_1d>;
+       nvmem-cells = <&macaddr_oemdata_1d 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy0>;

diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index f534d51aa1fd7e59088ef020a9d16c06c0e892a1..b20a36a031900f9afa473bb38298e915666dec91 100644 (file)
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -158,7 +158,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -188,7 +190,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
@@ -202,9 +204,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
        fixed-link {

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
index 208840ebba2f04fd8ba5551e3cc57d465eddc1e2..8ce173f70dd0f40f14855cbb2c662336b2b3d65a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
@@ -98,7 +98,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -121,7 +123,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        pll-data = <0xbe000000 0xb0000101 0xb0001313>;
@@ -144,7 +146,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 10>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <10>;
 };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index af305f8f07ae0cfe3738936c982c318b914eac36..d98600934ad60dc590dcc8a2d355037571f1f012 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -58,9 +58,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        phy-handle = <&phy1>;
        pll-data = <0x03000101 0x00000101 0x00001313>;

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index 6202ff37992a9b0845d096f00ab73bfc51553d67..c5209046173f01e6eac5509cc936cc07c9a1f7d5 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -93,9 +93,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        phy-handle = <&phy1>;
        pll-data = <0x03000101 0x00000101 0x00001313>;

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index f4a2cf040d2348c198ddc52239b11b13255ff93a..9a2579dd941b3a2b851ff3a8f68bf3f06732d92c 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -76,7 +76,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -109,7 +111,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
        phy-handle = <&phy4>;
 
@@ -124,7 +126,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };

diff --git a/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts b/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts
index 47e4fec1424dfc9ce86d13c2d4992f7c9b8f8b17..56c08621a7465b87baf6fcfaffe7cf868853eb2d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts
@@ -68,7 +68,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
 
                        calibration_art_1000: calibration@1000 {
@@ -95,7 +97,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
@@ -107,17 +109,15 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <1>;
 };
 
 &ath10k_0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+       nvmem-cells = <&macaddr_art_0 2>, <&calibration_art_5000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <2>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts b/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts
index 208eb11cd55270b7382ed3ec475ddf6fa519ec4b..9fa1927c1db84b6dd82aa632b1908b8804d22487 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts
@@ -56,7 +56,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
 
                        calibration_art_1000: calibration@1000 {
@@ -90,7 +92,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy1>;
@@ -102,9 +104,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        phy-handle = <&phy2>;
 
@@ -116,17 +117,15 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_art_0 2>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <2>;
 };
 
 &ath10k_1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+       nvmem-cells = <&macaddr_art_0 3>, <&calibration_art_5000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <3>;
 };
 
 &pcie1 {

diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
index 12b60d0822936302d404005c11be83a2d81f14cd..32a176b542e483a7e9ac2771f39570047c2f507f 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
@@ -118,7 +118,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -152,7 +154,7 @@
 
        pll-data = <0x82000101 0x80000101 0x80001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -185,9 +187,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index 28e01ddd56545815379c11811c7c112011073d40..218d5eb944d51b570f66b0fa4b2bf400b41c37e2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -126,7 +126,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -149,7 +151,7 @@
 
        pll-data = <0x82000000 0x80000101 0x80001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -165,9 +167,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
index 211255cddebc41d94995ae8633e2e261dee18776..8ef3241ee0dcc93a0c122d4171a474d15b809c25 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
@@ -19,8 +19,7 @@
        wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 16>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <16>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
index 0d29c5cf06db3127b52d9e8515f3e0a641f4df90..cd3baacd1584044ea45f8a55ff0b4c495a92d392 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
@@ -19,8 +19,7 @@
        wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 16>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <16>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
index 2744b01c8e3f3908f48dc994e1e9c970898503ff..ee4b82ee8d9de4746d9bbb36c8fd4bd8ec382322 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
@@ -137,7 +137,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -171,7 +173,7 @@
 
        pll-data = <0x82000101 0x80000101 0x80001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -204,9 +206,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &pcie1 {

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 9193d0e511d2c1c5ddc29d41736dcfe82de9aaf9..d448ca4284500b71fd5de78ed4fa216f7818e2ac 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -167,7 +167,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -205,7 +207,7 @@
 
        pll-data = <0x82000101 0x80000101 0x80001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -238,7 +240,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };

diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
index 9bed24ad09379afd8a2b199686bf54152ac5d0dc..716bc0d77b60c737f895fe1d4f18bd97a7dc581f 100644 (file)
--- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
+++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
@@ -96,7 +96,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_pridata_400: macaddr@400 {
+                                               compatible = "mac-base";
                                                reg = <0x400 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -137,9 +139,8 @@
 
        phy-handle = <&phy0>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
@@ -147,7 +148,7 @@
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
        nvmem-cell-names = "mac-address";
 
        fixed-link {

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
index a017d2f05901470bebc3d361ad4aabe17cfd9a6c..d41b065c27e049ec12e4e2f707b41c43359de7bf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
@@ -40,7 +40,9 @@
                        #size-cells = <1>;
 
                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                               compatible = "mac-base";
                                reg = <0x1fc00 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -59,19 +61,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
index 2f5ffe15786032dcb7b9ec29f0b3943f1396730b..83e51b42cce5106673b631c9c3797ee69b33feb0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
@@ -40,7 +40,9 @@
                        #size-cells = <1>;
 
                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                               compatible = "mac-base";
                                reg = <0x1fc00 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -69,17 +71,16 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
-       nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
index b2877676e87a8f5263f36ad4c2f27d60487b4471..c722caeb5532d2192d417031e2d2486ad28f07c7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
@@ -41,7 +41,9 @@
                        #size-cells = <1>;
 
                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                               compatible = "mac-base";
                                reg = <0x1fc00 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -74,13 +76,12 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -91,13 +92,12 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <(-1)>;
-               nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_uboot_1fc00 (-1)>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
        };
 };
 
 &wmac {
-       nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
index c40cb1265840e94d35361a11ab413c1d4ce73659..5869ee16e39ca25365390e55848a0bf63574604c 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
@@ -59,7 +59,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_romfs_f100: macaddr@f100 {
+                                               compatible = "mac-base";
                                                reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -80,18 +82,17 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cells = <&macaddr_romfs_f100 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cells = <&macaddr_romfs_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cells = <&macaddr_romfs_f100 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
index 950e1d7b757d6ca35e2e464092b4e2b8a16fee7a..7094077bc6f1844a0c1a5c4dc0942bd07835c2c2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
@@ -53,7 +53,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_romfs_f100: macaddr@f100 {
+                                               compatible = "mac-base";
                                                reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -74,18 +76,17 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cells = <&macaddr_romfs_f100 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cells = <&macaddr_romfs_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cells = <&macaddr_romfs_f100 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 30e80177a907afd56014bc9da394e83726a5f3ef..f90ebfea15573867128952bcc1451cf3a40ba4c0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -142,7 +142,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -168,7 +170,7 @@
        phy-handle = <&phy4>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -176,7 +178,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index b052a830bc751b7d755da74834de465ef7ae1ceb..0edba24040e3599854d82661b79a8cff230baf88 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -96,9 +96,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_ath9k_pci>;
+               nvmem-cells = <&macaddr_uboot_1fc00 (-2)>, <&cal_ath9k_pci>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <(-2)>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -144,7 +143,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -200,9 +201,8 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
        phy-handle = <&phy0>;
        pll-data = <0x56000000 0x00000101 0x00001616>;
 
@@ -215,7 +215,7 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
@@ -228,7 +228,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_ath9k_soc>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>, <&cal_ath9k_soc>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <(-1)>;
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
index ccfebcc7ff85e07b7e855a2b083c9f2608d81144..99a4273ad0db4a526ca46026bcabab794498bad9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
@@ -40,7 +40,9 @@
                        #size-cells = <1>;
 
                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                               compatible = "mac-base";
                                reg = <0x1fc00 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -59,19 +61,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 158d1200dec331c5e98febfda73734aa9c31eabd..f4390f46568102c422636a4f47ab9007ab7e7813 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -104,7 +104,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -148,9 +150,8 @@
 
        pll-data = <0x56000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
        phy-handle = <&phy0>;
 };
 
@@ -159,7 +160,7 @@
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 
        fixed-link {
@@ -171,6 +172,6 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
index 6ad6add64afd58b11cac1a92edaac8099e6e66e5..5f5ef0f968719e368218c2cfcbb0a67e4c15c1e7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
+++ b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
@@ -111,7 +111,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
@@ -126,9 +128,8 @@
 
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 0a01ed6dbc1ea9a5e0b89335f82fb005fc9618e1..6179e621bf74f2162d7eff8be353b7388c526cbf 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -159,7 +159,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -182,22 +184,21 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
index 5c1f0334ffa97ae78956033183ea9d424a82d9a9..a09e1fae6f4a2a975cde90ce3bf2ebf83dfbccee 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
@@ -41,7 +41,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -68,19 +70,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index 1963428cd0ff9eeb4ee2c2488ebaf71feab471c0..720a2b01a9c81d47e25ce3a10b31a123d7b63066 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -58,7 +58,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -85,19 +87,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
index 9f66b1c64213ea92450d69732364d64407fa701c..be6e6ade1c7e7d8dc5655d8fbcd6196115a588cd 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
@@ -64,7 +64,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -91,19 +93,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
index 8602449d94ab35dfbd400262a9b6bbccc051ea58..eff85d6a586154fa59e4c324b48e723e2b8ca3f3 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
@@ -53,7 +53,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -80,19 +82,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
index fe217f206e0f0546c6ba7b02f721b1b2e7b89fc1..18053d691c8e82f1c2b1ae8d72e89129c1ecc612 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
@@ -53,7 +53,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -86,19 +88,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
index 505bfefed14c937b508d5aa3ddcec2a1d6c72eb4..068f9577591874bbf20f68737361b47426e90bce 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
@@ -48,7 +48,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -81,19 +83,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
index 856161a987327ccc9d5ec558f3f8ef974dcab675..cf5f3a3a4e045d2a7d5f6cfd83cdcb88e53a8799 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
@@ -63,9 +63,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&precalibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&precalibration_ath10k>;
                nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
@@ -106,7 +104,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -163,13 +163,13 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
+       nvmem-cells = <&macaddr_info_8 0>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts b/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts
index f4ba15a599df832fb21b29cc8a475b5f85d8e88e..04567e6b889eb39eb8713c260ef92a9c618163c8 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts
@@ -87,7 +87,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_0fc00: macaddr@0fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x0fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -132,9 +134,8 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               nvmem-cells = <&macaddr_uboot_0fc00>, <&calibration_ath10k>;
+               nvmem-cells = <&macaddr_uboot_0fc00 (-2)>, <&calibration_ath10k>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <(-2)>;
        };
 };
 
@@ -147,24 +148,22 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_0fc00>;
+       nvmem-cells = <&macaddr_uboot_0fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_0fc00>;
+       nvmem-cells = <&macaddr_uboot_0fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_0fc00>, <&calibration_ath9k>;
+       nvmem-cells = <&macaddr_uboot_0fc00 (-1)>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <(-1)>;
 };
 
 &usb0 {

diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index b0f5c8de43b448eacbef763bd32c51a272c5a62e..5f9f575b447325e0043eb86f3f31fabce033bd14 100644 (file)
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -100,7 +100,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -134,7 +136,7 @@
        status = "okay";
 
        phy-handle = <&swphy4>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -149,7 +151,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };

diff --git a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
index 33a496f8b7ba8d7e9b359f258cfaed5619dd9a14..2f0a0992a9d45f88e6bc1476249cc399731bc23b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
+++ b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
@@ -91,7 +91,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -132,7 +134,7 @@
        pll-data = <0x03000101 0x00000101 0x00001919>;
 
        phy-mode = "sgmii";
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
 };
@@ -141,7 +143,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 10>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <10>;
 };

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
index 77d5fc360bc56f10280790d774b1391f7dc18461..a69b9d54e8b8434d00e073329ac6e580a482ba96 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
@@ -55,7 +55,9 @@
                        };
 
                        macaddr_art_1002: macaddr@1002 {
+                               compatible = "mac-base";
                                reg = <0x1002 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
 
                        cal_art_5000: cal@5000 {
@@ -77,9 +79,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
index 7d977802ea914ffa17b0fbfa3a8d7f6afed9da7c..51800820542359812292659ffe7480b8a5187c84 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
@@ -49,16 +49,17 @@
                        };
 
                        macaddr_art_1002: macaddr@1002 {
+                               compatible = "mac-base";
                                reg = <0x1002 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
                };
        };
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
index 929cedad720db6157d532fd7e92321f94b7c4afd..9c1e82bf986c7938b856fe1f6d9e56d017037fb9 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
@@ -36,7 +36,9 @@
                #size-cells = <1>;
 
                macaddr_info_8: macaddr@8 {
+                       compatible = "mac-base";
                        reg = <0x8 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                precalibration_ath10k: pre-calibration@5000 {
@@ -62,9 +64,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&precalibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&precalibration_ath10k>;
                nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
index da082d3b405e089c6973647c37a5af427a7a6c67..73700b626f3ff0886ef93df9a835b5fd0fe7daec 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
@@ -36,7 +36,9 @@
                #size-cells = <1>;
 
                macaddr_info_8: macaddr@8 {
+                       compatible = "mac-base";
                        reg = <0x8 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                precalibration_ath10k: pre-calibration@5000 {
@@ -61,9 +63,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&precalibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&precalibration_ath10k>;
                nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
index e03fdf6f8880db4767c6bd7be74eb08a5fb8256b..1e100b31a72d6fba0b56ada102ae62df110af2f7 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
@@ -57,7 +57,9 @@
                #size-cells = <1>;
 
                macaddr_info_8: macaddr@8 {
+                       compatible = "mac-base";
                        reg = <0x8 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_ath10k: calibration@5000 {
@@ -83,9 +85,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&calibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&calibration_ath10k>;
                nvmem-cell-names = "mac-address", "calibration";
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
index 6e34938379f8fbdd5a36cf0897ef6b4edb43645e..32fba980519f75cf5ca5d03b3dd6842678400afa 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
@@ -36,7 +36,9 @@
                #size-cells = <1>;
 
                macaddr_info_8: macaddr@8 {
+                       compatible = "mac-base";
                        reg = <0x8 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                precalibration_ath10k: pre-calibration@5000 {
@@ -62,9 +64,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&precalibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&precalibration_ath10k>;
                nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
index 3fbb3414c1afdb98c831976487cb05e020d3b1ad..1c48775cdffbb54f3a59d788689f2533cdb03d51 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
@@ -36,7 +36,9 @@
                #size-cells = <1>;
 
                macaddr_info_8: macaddr@8 {
+                       compatible = "mac-base";
                        reg = <0x8 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                precalibration_ath10k: pre-calibration@5000 {
@@ -61,9 +63,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&precalibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&precalibration_ath10k>;
                nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
index b4c9e7e5d29f57a2a08847c0c9d544d3c4e101bf..e7f21fafa50858d767194174a7d682d3b816fb7a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
@@ -50,7 +50,9 @@
                #size-cells = <1>;
 
                macaddr_info_8: macaddr@8 {
+                       compatible = "mac-base";
                        reg = <0x8 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_ath10k: calibration@5000 {
@@ -76,9 +78,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&calibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&calibration_ath10k>;
                nvmem-cell-names = "mac-address", "calibration";
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
index fb504f1fcf87d5999470efe7a62829888896c219..1e37db82bce497b34ba02658c8378d4399e6c953 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
@@ -51,9 +51,7 @@
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
-               mac-address-increment = <1>;
-
-               nvmem-cells = <&macaddr_info_8>, <&calibration_ath10k>;
+               nvmem-cells = <&macaddr_info_8 1>, <&calibration_ath10k>;
                nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
@@ -100,7 +98,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
                                                reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -178,13 +178,13 @@
        phy-handle = <&phy0>;
        phy-mode = "sgmii";
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
+       nvmem-cells = <&macaddr_info_8 0>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
index 438e6bc2ec18c9c809d208f825696bf0a111b7b2..9e0b97fcbf3321684780811546c2aa5554be6dbe 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
@@ -115,7 +115,7 @@
 
        pll-data = <0x03000000 0x00000101 0x00001313>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 
        qca956x-serdes-fixup;
@@ -128,6 +128,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
+       nvmem-cells = <&macaddr_info_8 0>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9563_zte_mf281.dts b/target/linux/ath79/dts/qca9563_zte_mf281.dts
index a4e54975db596801b8190c02e994fcb99581d394..8fcd093d66f494f0d667cb2e2c4e296ca11b7418 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf281.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf281.dts
@@ -75,7 +75,9 @@
                                #size-cells = <1>;
 
                                macaddr_mac_0: macaddr@0 {
+                                       compatible = "mac-base";
                                        reg = <0x0 0x6>;
+                                       #nvmem-cell-cells = <1>;
                                };
                        };
                };
@@ -150,14 +152,13 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_mac_0>;
+       nvmem-cells = <&macaddr_mac_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wifi_ath10k {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
+       nvmem-cells = <&macaddr_mac_0 1>, <&cal_caldata_5000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
-       mac-address-increment = <1>;
 };
 
 &pinmux {
@@ -167,6 +168,6 @@
 };
 
 &wmac {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_1000>;
+       nvmem-cells = <&macaddr_mac_0 0>, <&cal_caldata_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9563_zte_mf282.dts b/target/linux/ath79/dts/qca9563_zte_mf282.dts
index 2cb3c1a60b9a30f08b8b6ebfab6885b206fae518..439cc1af4af943b2d82d9f988748652672d8a2de 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf282.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf282.dts
@@ -87,7 +87,9 @@
                                #size-cells = <1>;
 
                                macaddr_mac_0: macaddr@0 {
+                                       compatible = "mac-base";
                                        reg = <0x0 0x6>;
+                                       #nvmem-cell-cells = <1>;
                                };
                        };
                };
@@ -117,17 +119,16 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_mac_0>;
+       nvmem-cells = <&macaddr_mac_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wifi_ath10k {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
+       nvmem-cells = <&macaddr_mac_0 1>, <&cal_caldata_5000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <1>;
 };
 
 &wmac {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_1000>;
+       nvmem-cells = <&macaddr_mac_0 0>, <&cal_caldata_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286.dts b/target/linux/ath79/dts/qca9563_zte_mf286.dts
index 26e27ee0204be79f991aa04ea78d09716f6ba901..e64680e11215411c2cf24f1ee9d8e54909bbc36b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf286.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf286.dts
@@ -88,7 +88,9 @@
                                #size-cells = <1>;
 
                                macaddr_mac_0: macaddr@0 {
+                                       compatible = "mac-base";
                                        reg = <0x0 0x6>;
+                                       #nvmem-cell-cells = <1>;
                                };
                        };
                };
@@ -118,17 +120,16 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_mac_0>;
+       nvmem-cells = <&macaddr_mac_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wifi_ath10k {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>, <&cal_caldata_5000>;
+       nvmem-cells = <&macaddr_mac_0 1>, <&cal_caldata_5000>, <&cal_caldata_5000>;
        nvmem-cell-names = "mac-address", "calibration", "pre-calibration";
-       mac-address-increment = <1>;
 };
 
 &wmac {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_1000>;
+       nvmem-cells = <&macaddr_mac_0 0>, <&cal_caldata_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi b/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
index dc08a21452c66bf3af1ceea5bc73e7c40d3ca043..89177ef2d350274a0a845d48a7ebb5abf5df87fb 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
+++ b/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
@@ -91,7 +91,9 @@
                                #size-cells = <1>;
 
                                macaddr_mac_0: mac-address@0 {
+                                       compatible = "mac-base";
                                        reg = <0x0 0x6>;
+                                       #nvmem-cell-cells = <1>;
                                };
                        };
                };
@@ -122,17 +124,16 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_mac_0>;
+       nvmem-cells = <&macaddr_mac_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wifi_ath10k {
-       nvmem-cells = <&macaddr_mac_0>, <&precal_art_5000>;
+       nvmem-cells = <&macaddr_mac_0 0x20000>, <&precal_art_5000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
-       mac-address-increment = <0x20000>;
 };
 
 &wmac {
-       nvmem-cells = <&macaddr_mac_0>, <&cal_art_1000>;
+       nvmem-cells = <&macaddr_mac_0 0>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };