ath79: ar: convert to mac-base

Replacement for deprecated mac-address-increment

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

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
index 14b5edb0967f0efacc4fb2f077f67336fc11c53f..96a76a3cfc603b6bbbee2da2f763b541c5cf98a1 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
@@ -122,9 +122,8 @@
 
        ath9k0: wifi@0,11 {
                compatible = "pci168c,0029";
-               nvmem-cells = <&macaddr_hwinfo_1c>;
+               nvmem-cells = <&macaddr_hwinfo_1c 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                reg = <0x8800 0 0 0 0>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -132,9 +131,8 @@
 
        ath9k1: wifi@0,12 {
                compatible = "pci168c,0029";
-               nvmem-cells = <&macaddr_hwinfo_1c>;
+               nvmem-cells = <&macaddr_hwinfo_1c 2>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
                reg = <0x9000 0 0 0 0>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -151,7 +149,7 @@
 
 &eth0 {
        status = "okay";
-       nvmem-cells = <&macaddr_hwinfo_1c>;
+       nvmem-cells = <&macaddr_hwinfo_1c 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
@@ -194,7 +192,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_hwinfo_1c: macaddr@1c {
+                                               compatible = "mac-base";
                                                reg = <0x1c 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index 26147a2c80807b13da75416dfc0ede45fb44316f..e3f48fee852ccee6a2fbbe5cc3eafd7dce72340a 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -159,7 +159,9 @@
                                        };
 
                                        macaddr_art_520c: macaddr@520c {
+                                               compatible = "mac-base";
                                                reg = <0x520c 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -254,9 +256,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_520c>;
+       nvmem-cells = <&macaddr_art_520c 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        phy-handle = <&phy4>;
 };

diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index 110f1ba2df16d6b57247ce29aded54a7dae02ad4..6b8574e880f92960e9acdc0cfd1041573c4de735 100644 (file)
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -74,9 +74,8 @@
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cells = <&macaddr_config_66 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -85,9 +84,8 @@
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cells = <&macaddr_config_66 2>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -103,7 +101,7 @@
 
 &eth0 {
        status = "okay";
-       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cells = <&macaddr_config_66 0>;
        nvmem-cell-names = "mac-address";
 
        pll-data = <0x00110000 0x00001099 0x00991099>;
@@ -148,7 +146,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_66: macaddr@66 {
+                                               compatible = "mac-base";
                                                reg = <0x66 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
index 7baae2450b9e09954834d150db067e606e769123..9761234714c87b19c0208deb4588d84ce077218b 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
@@ -126,7 +126,9 @@
                                        };
 
                                        macaddr_art_520c: macaddr@520c {
+                                               compatible = "mac-base";
                                                reg = <0x520c 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        calibration_art_1000: calibration@1000 {
@@ -157,9 +159,8 @@
        ath9k1: wifi@0,12 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_520c>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_520c 1>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <1>;
                #gpio-cells = <2>;
                gpio-controller;
        };

diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
index 1285cdb60987b864936b7428f54145ad9b5355f1..ad42e0a05fd2108cafddcaff663eccd0b6c5f53e 100644 (file)
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -154,7 +154,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_120c: macaddr@120c {
+                                               compatible = "mac-base";
                                                reg = <0x120c 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -163,16 +165,15 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cells = <&macaddr_art_120c 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cells = <&macaddr_art_120c 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie {
@@ -182,7 +183,7 @@
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_art_120c>;
+               nvmem-cells = <&macaddr_art_120c 0>;
                nvmem-cell-names = "mac-address";
                #gpio-cells = <2>;
                gpio-controller;

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index d1cdf56d18c70901964b95d53071dbf3605ff86f..32903c2e8ff42cbfbd971278760e998d9669687b 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -175,7 +175,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -188,7 +190,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -205,9 +207,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index d069f1423514936eb17f1d6ceeeb83baa0ebc8fb..ac27874c68ab7be6d8472870b63f57f898c9fb14 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -108,7 +108,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -121,7 +123,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -138,9 +140,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;

diff --git a/target/linux/ath79/dts/ar7240_tplink.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi
index 959032640a850016ad01f42a00119fb065eeedc3..5bcfb54bfce298f3f6eca87c24287d63af7a9ec1 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink.dtsi
@@ -84,7 +84,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -114,7 +116,7 @@
        ath9k: wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00 0>;
                nvmem-cell-names = "mac-address";
                #gpio-cells = <2>;
                gpio-controller;

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
index 9d896360dc12c2fe2f54b37a5b6be8c4248ac57c..6c090fb437e82475577591c9a3c75309ec44112a 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
@@ -30,15 +30,13 @@
 };
 
 &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 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &ath9k {

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index 61886c6589fcbc4bbf3de69a02e84588860fa573..0a6936c5bfd57513a8298b930f7afc7ee557e082 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -178,7 +178,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_art_6: macaddr@6 {
@@ -193,7 +195,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -210,9 +212,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002e";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
index 42942834cf8c361928e6ab3d99ab038e1b08ea66..324207656fc79c74e1b517aac5edb8d9c485948f 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
@@ -42,7 +42,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
 
                        macaddr_art_6: macaddr@6 {
@@ -53,7 +55,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -63,7 +65,6 @@
 };
 
 &ath9k {
-       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/ar7241_netgear_wnr2200-8m.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
index 95217f6a7b9272ef6477c5b2f767e942be500d04..fbd3cb8ec8fff8480d1ae6463becc4cb29cbe79f 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
@@ -42,7 +42,9 @@
                        #size-cells = <1>;
 
                        macaddr_art_0: macaddr@0 {
+                               compatible = "mac-base";
                                reg = <0x0 0x6>;
+                               #nvmem-cell-cells = <1>;
                        };
 
                        macaddr_art_6: macaddr@6 {
@@ -53,7 +55,7 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -63,7 +65,6 @@
 };
 
 &ath9k {
-       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/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index fe3f047dc1a9e2bee7f2bbd4dc34e678896c336b..01eee39f1958bccc344b2334d51a2b991db5377d 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -71,7 +71,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -99,7 +101,7 @@
                #gpio-cells = <2>;
                gpio-controller;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00 0>;
                nvmem-cell-names = "mac-address";
        };
 };
@@ -107,12 +109,11 @@
 &eth0 {                /* WAN interface, initialized last as eth1 */
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {                /* LAN interface, initialized first as eth0 */
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
index 02b96912ba9a9dcb64db6b235f8f35ae500be91f..e7fe31f36d0db2db25b7a1d6dd82432bd6744dd4 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -109,7 +109,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -138,7 +140,7 @@
                #gpio-cells = <2>;
                gpio-controller;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00 0>;
                nvmem-cell-names = "mac-address";
        };
 };
@@ -146,13 +148,11 @@
 &eth0 {
        status = "okay";
 
-       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>;
 };

diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
index 361d70eb39c5873bcf4d0195476b628d87c7916c..8e8deba933775dd15de2ce0ab59c7398dfe2e29d 100644 (file)
--- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
@@ -63,7 +63,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
@@ -78,9 +78,8 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
@@ -94,7 +93,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/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
index 2de6dab20dffb13a95afb923ec3be63f4e3bf761..69629335b3ca79565cebf651d9253d561854112c 100644 (file)
--- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
@@ -63,7 +63,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
@@ -78,9 +78,8 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 (-1)>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <(-1)>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
@@ -94,7 +93,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/ar7242_meraki_mr12.dts b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
index 070cea1217dbfe553a420d7f7b35069b2e2facbc..adea2778eac82c77bf287faee004cabcff3f7005 100644 (file)
--- a/target/linux/ath79/dts/ar7242_meraki_mr12.dts
+++ b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
@@ -74,9 +74,8 @@
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cells = <&macaddr_config_66 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
        };
 };
 
@@ -91,7 +90,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cells = <&macaddr_config_66 0>;
        nvmem-cell-names = "mac-address";
 
        pll-data = <0x02000000 0x00000101 0x00001313>;
@@ -107,7 +106,7 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cells = <&macaddr_config_66 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -147,7 +146,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_66: macaddr@66 {
+                                               compatible = "mac-base";
                                                reg = <0x66 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
index f2bd0541c18506607aa39e6050608ee2ddc9ec79..256fe5f6154cfa49df834ef2958d7dd540dbe519 100644 (file)
--- a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
+++ b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
@@ -85,7 +85,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -96,16 +98,15 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
index 32ff360e893d4684d46a87fc0a03d97db4040949..565f62a0ba8cf58ba603bcf7e8262f974883191f 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
+++ b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
@@ -24,9 +24,8 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 
        gmac-config {
                device = <&gmac>;
@@ -39,9 +38,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pinmux {
@@ -75,7 +73,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ath79/dts/ar9331_onion_omega.dts b/target/linux/ath79/dts/ar9331_onion_omega.dts
index f1bb5cbd74c29820db74f5931c7dfa252b798ee6..81fab872b5cc661873c64f39ffd1ecaa0c0691ff 100644 (file)
--- a/target/linux/ath79/dts/ar9331_onion_omega.dts
+++ b/target/linux/ath79/dts/ar9331_onion_omega.dts
@@ -72,9 +72,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 
        gmac-config {
                device = <&gmac>;
@@ -107,7 +106,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -132,6 +133,6 @@
 
        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/ar9331_teltonika_rut230-v1.dts b/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
index ba1daa4fb880a1288a902966647db6bcaf28a736..69965f86a8bf900ce3d5895896db3f191e2aa894 100644 (file)
--- a/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
+++ b/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
@@ -109,15 +109,14 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -151,7 +150,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -200,7 +201,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
index cd6da59b3dca747fa99e0fe7935143aa383352fd..d1336e968956091589d0f0d50d3f2184f5be1857 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi
@@ -32,7 +32,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -53,19 +55,18 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &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/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index bffe35860256475776bec44aa3218faf1b120275..613b357dc872d2ff66dc69602b9a2ab27b220f1f 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -108,7 +108,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -131,9 +133,8 @@
 &eth0 {                /* WAN interface, initialized last as eth1 */
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        gmac-config {
                device = <&gmac>;
@@ -146,7 +147,7 @@
 &eth1 {                /* LAN interface, initialized first as eth0 */
        status = "okay";
 
-       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/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index 722ce05014961b5c4e0f16b713f6c92e26d21a74..5ec17034d17b6d6269c311c40778200639cb252a 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -125,7 +125,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -143,16 +145,15 @@
        status = "okay";
 
        phy-handle = <&swphy0>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        phy-handle = <&swphy4>;
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        gmac-config {

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index 1f089affac3f421e571f563f229f4f52d3fa8f85..3971df17f81fec4b314b20b74208d16858801d38 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -71,7 +71,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -100,19 +102,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/ar9341_tplink_tl-wr841-v8.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
index d0f00a4a49432fcf95613db64cbc5e8586f2b053..417461a59559f9be911b7502c6e6186845a93307 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
@@ -54,7 +54,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -75,19 +77,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/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index 3713998e24a6ebe9b719106f0c33b5c0f1c72099..d0f4c2e1f5aab52e309b5f2d863e31f7c686cac0 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -72,7 +72,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -101,21 +103,20 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &eth1 {
        phy-handle = <&swphy4>;
 
-       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/ar9341_tplink_tl-wr941nd-v5.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
index 492e46e95ca780198e7cf9416adec76cd14d6a7b..180504523c997bcb29d6be6a52369be01881564c 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts
@@ -64,7 +64,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -85,19 +87,18 @@
 };
 
 &eth0 {                // WAN port, initialized last as eth1
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {                // LAN ports, initialized first as eth0
-       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/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
index 1d4be4d3164f5bd420c8c94aec40ade07d4a38b9..2a2036201e6239f384300375a76b80fc767cb335 100644 (file)
--- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
+++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
@@ -106,9 +106,8 @@
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
 
-               nvmem-cells = <&macaddr_hw_info_0>;
+               nvmem-cells = <&macaddr_hw_info_0 2>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
        };
 };
 
@@ -148,7 +147,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_hw_info_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -171,9 +172,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_hw_info_0>;
+       nvmem-cells = <&macaddr_hw_info_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &nand {
@@ -227,7 +227,7 @@
 
        pll-data = <0x06000000 0x00000101 0x00001313>;
 
-       nvmem-cells = <&macaddr_hw_info_0>;
+       nvmem-cells = <&macaddr_hw_info_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";

diff --git a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
index 48388862090b67f5c610d639449509aa83444f49..a45aa444de4b85bf4fd46c0f0f7ddc7dc84b85ae 100644 (file)
--- a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
+++ b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
@@ -72,7 +72,7 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy0>;
@@ -87,9 +87,8 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,0030";
                reg = <0x0 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <1>;
                ieee80211-freq-limit = <2402000 2482000>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -101,9 +100,8 @@
 
        ieee80211-freq-limit = <4900000 5990000>;
 
-       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>;
 };
 
 &art {
@@ -113,7 +111,9 @@
                #size-cells = <1>;
 
                macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
                        reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_art_1000: calibration@1000 {

diff --git a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
index f1926cc1ebb2895de7db21d25102c0666ab21324..df157f582cf8cf51af6a37c8dfcdae0f7aad9926 100644 (file)
--- a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
+++ b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
@@ -123,7 +123,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_1002: macaddr@1002 {
+                                               compatible = "mac-base";
                                                reg = <0x1002 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -140,9 +142,8 @@
 
        pll-data = <0x02000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;

diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
index 7e906dd3e23b8916e717cf69b0a26aa4af13cca9..888e3f82ada1cc673db92326558e9904cf136796 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
@@ -29,22 +29,20 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &pcie {
        wifi@0,0,0 {
-               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_0 0>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
        };
 };
 
 &wmac {
-       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)>;
 };
 
 &art {
@@ -54,7 +52,9 @@
                #size-cells = <1>;
 
                macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
                        reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_art_1000: calibration@1000 {

diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index 53456d40939cb90c0a02fa8b913b32232681911b..ac9bbea5d4d7343eaf8a863c7c29fe626c731325 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -24,22 +24,20 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &pcie {
        wifi@0,0,0 {
-               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)>;
        };
 };
 
 &wmac {
-       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)>;
 };
 
 &art {
@@ -49,7 +47,9 @@
                #size-cells = <1>;
 
                macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
                        reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_art_1000: calibration@1000 {

diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
index b7ec8199e9b814a71bab16e312a6d8af0c3078a7..7661789e2f6156f17bd5213fccdde422f8410a24 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
@@ -81,7 +81,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        calibration_art_1000: calibration@1000 {
@@ -112,7 +114,7 @@
 
        pll-data = <0x02000000 0x00000101 0x00001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -129,9 +131,8 @@
 &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>;
 };
 
 &pcie {
@@ -140,9 +141,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_0 8>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <8>;
 
                gpio-controller;
                #gpio-cells = <2>;

diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
index 9a7e5e16ca1697e07a2f93b3dca54ac03fce9086..38153d9dc068c87294fab8bebe19a5e4062dad14 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
@@ -159,7 +159,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        calibration_art_1000: calibration@1000 {
@@ -190,7 +192,7 @@
 
        pll-data = <0x02000000 0x00000101 0x00001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -208,17 +210,15 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &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>;
 };
 
 &pcie {
@@ -227,8 +227,7 @@
        wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_0 16>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <16>;
        };
 };

diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index 451b0ecaca66ef5ed220f4640f3316d7581ddbd7..aab04b080a89cbf4f04803079d0b03e9f8b3e606 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -114,7 +114,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -128,9 +130,8 @@
        ath9k: wifi@0,0 {
                compatible = "168c,0030";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cells = <&macaddr_art_0 (-2)>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <(-2)>;
                mtd-cal-data = <&art 0x5000>;
                qca,no-eeprom;
                ieee80211-freq-limit = <2402000 2482000>;
@@ -144,9 +145,8 @@
 
        ieee80211-freq-limit = <4900000 5990000>;
        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)>;
 };
 
 &mdio0 {
@@ -164,7 +164,7 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";

diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
index 31145b39298d14758d42e8cc6d78686ae0afec8c..33e2990284e22696e3913ea408c8a788c802c8b9 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
@@ -24,15 +24,14 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
        nvmem-cell-names = "mac-address";
 
        gmac-config {

diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
index f44e7a01bed1da57a625d49d170159b02eb973a1..b20d187941da86b1e0403e133bbf6e24cfca7a1f 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
@@ -24,15 +24,14 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
        nvmem-cell-names = "mac-address";
 
        gmac-config {

diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts b/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts
index 6b84cb0ef9764d2c70abee87735d5cebf385ebae..ed9cd2000a2055d5630a6d74271dc775b2dc8df5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts
@@ -31,7 +31,7 @@
 
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";

diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts b/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts
index 13aaf322b76e02e1a3e391f4f50dfc3208bd6f94..5a7feba0b6526247922e946338be28cb4137f99e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts
@@ -31,7 +31,7 @@
 
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";

diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi b/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
index 0bc735c0a9b5b3fd37fbcce31fa3b86cca250433..238a59cbe8d54360f70561016a7403bf2180b26e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi
@@ -92,7 +92,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_pridata_400: macaddr@400 {
+                                               compatible = "mac-base";
                                                reg = <0x400 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ath79/dts/ar9344_samsung_wam250.dts b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
index 4b7bad787372fe1e7764b7b341fc5bbecb4e378e..0bbd5c92fe9e59e3930ad1825a226b6ad6252109 100644 (file)
--- a/target/linux/ath79/dts/ar9344_samsung_wam250.dts
+++ b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
@@ -66,9 +66,8 @@
 
        phy-handle = <&swphy0>;
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        gmac-config {
                device = <&gmac>;
@@ -79,7 +78,7 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -144,7 +143,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_1002: macaddr@1002 {
+                                               compatible = "mac-base";
                                                reg = <0x1002 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
index 2cb8d4015c514a2a524499b0a5b710cc9814862d..b94b44cfc4c9a1f1060ab6db6e55c72e1d3fdef0 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
@@ -164,15 +164,14 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
index 7a1f05afccaca70aa45c90679a09767bffb68c03..d8ce6a1092735222f9e6ecc48458514a7247ab6e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
@@ -163,15 +163,14 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
index e8b6e0893684c3294beddc5bdf788476b1212274..64959c9dc2998af9bc85b8f4a7221e4d53a5d87a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
@@ -86,7 +86,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -154,9 +156,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &pinmux {

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
index 1600e12b64481607a476a233d4bb909f32c22ce4..a66e1fefa25eed20bf3094581c41cc581ce4245a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
@@ -49,16 +49,30 @@
        status = "okay";
 };
 
-&ath9k {
-       mac-address-increment = <1>;
+&wmac {
+       status = "okay";
+       nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
+};
+
+&pcie {
+       status = "okay";
+
+       ath9k: wifi@0,0 {
+               compatible = "pci168c,0033";
+               reg = <0x0000 0 0 0 0>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               nvmem-cells = <&macaddr_uboot_1fc00 1>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
+       };
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 
        gmac-config {
                device = <&gmac>;
@@ -72,7 +86,6 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index d2791aee709d9cfd2e4fc032243e71fffe5d717f..7aa1989290bdd2ebe8cc59202fabe6b6b434ad3d 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -76,7 +76,22 @@
 };
 
 &wmac {
-       mac-address-increment = <(-1)>;
+       status = "okay";
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>, <&cal_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
+};
+
+&pcie {
+       status = "okay";
+
+       ath9k: wifi@0,0 {
+               compatible = "pci168c,0033";
+               reg = <0x0000 0 0 0 0>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
+       };
 };
 
 &mdio0 {
@@ -104,7 +119,7 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
index 138582166bb06398dd464fcd9241fc5791ac7ea7..7f49b9bde7a8b7aab5d744e3687e463b325ca0b1 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
@@ -90,7 +90,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -123,22 +125,3 @@
                };
        };
 };
-
-&pcie {
-       status = "okay";
-
-       ath9k: wifi@0,0 {
-               compatible = "pci168c,0033";
-               reg = <0x0000 0 0 0 0>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_5000>;
-               nvmem-cell-names = "mac-address", "calibration";
-       };
-};
-
-&wmac {
-       status = "okay";
-       nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
-       nvmem-cell-names = "mac-address", "calibration";
-};

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
index a3910d512bc9006df677902c803e6570f530f1c0..6649e2477b25bf6db2b68a6eb996e37f188cbc42 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts
@@ -102,7 +102,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -143,7 +145,7 @@
 
        mtd-cal-data = <&art 0x1000>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -152,15 +154,14 @@
 
        phy-handle = <&swphy0>;
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 
        gmac-config {

diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
index b08dce2950ba6b2aac326cb6afca09baed60d9c8..2fd9a6e51bf72b43936aef02e4927d6194d266ce 100644 (file)
--- a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
+++ b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
@@ -56,9 +56,8 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &pcie {
@@ -73,9 +72,8 @@
 &wmac {
        /delete-property/ ieee80211-freq-limit;
 
-       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)>;
 };
 
 &art {
@@ -85,7 +83,9 @@
                #size-cells = <1>;
 
                macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
                        reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_art_1000: calibration@1000 {

diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
index 56f0c8e0487982dba82e9bbd24613ff822544251..9cf6819958feffa88022c82f4472f6b5035c5358 100644 (file)
--- a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
+++ b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
@@ -56,23 +56,20 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &pcie {
        wifi@0,0,0 {
-               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <(-1)>;
        };
 };
 
 &wmac {
-       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)>;
 };
 
 &art {
@@ -82,7 +79,9 @@
                #size-cells = <1>;
 
                macaddr_art_0: macaddr@0 {
+                       compatible = "mac-base";
                        reg = <0x0 0x6>;
+                       #nvmem-cell-cells = <1>;
                };
 
                calibration_art_1000: calibration@1000 {

diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index 1ab92c698cc9a936f8d4d64e7f92c2b774e544db..4b692b6d9bb3ab4183065e00af3bea3b865b4bb8 100644 (file)
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -150,7 +150,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_addr_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -164,9 +166,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_addr_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_addr_0 0x10>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <0x10>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -183,7 +184,7 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_addr_0>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_addr_0 0>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };
 
@@ -200,9 +201,8 @@
 
        pll-data = <0xe000000 0x04000101 0x04001313>;
 
-       nvmem-cells = <&macaddr_addr_0>;
+       nvmem-cells = <&macaddr_addr_0 0x21>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <0x21>;
 
        phy-mode = "rgmii-rxid";
        phy-handle = <&phy4>;