ath79: convert mtd-mac-address to nvmem implementation

Define nvmem-cells and convert mtd-mac-address to nvmem implementation.
The conversion is done with an automated script.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
index 083db183d421322c209a0fb814780be295fd4c18..8180e0d6bd5232dd91d1b1419a706f3475d41166 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
@@ -103,7 +103,8 @@
 
        ath9k0: wifi@0,11 { /* 2.4 GHz */
                compatible = "pci168c,0029";
-               mtd-mac-address = <&hwinfo 0x1c>;
+               nvmem-cells = <&macaddr_hwinfo_1c>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
                reg = <0x8800 0 0 0 0>;
                #gpio-cells = <2>;
@@ -112,7 +113,8 @@
 
        ath9k1: wifi@0,12 { /* 5 GHz */
                compatible = "pci168c,0029";
-               mtd-mac-address = <&hwinfo 0x1c>;
+               nvmem-cells = <&macaddr_hwinfo_1c>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <2>;
                reg = <0x9000 0 0 0 0>;
                #gpio-cells = <2>;
@@ -132,7 +134,8 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&hwinfo 0x1c>;
+       nvmem-cells = <&macaddr_hwinfo_1c>;
+       nvmem-cell-names = "mac-address";
 
        pll-data = <0x00110000 0x00001099 0x00991099>;
 
@@ -179,3 +182,13 @@
                };
        };
 };
+
+&hwinfo {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_hwinfo_1c: macaddr@1c {
+               reg = <0x1c 0x6>;
+       };
+};

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 15ac14869760e487127fe284efbc389d47f8182d..006755e4182d0a79c0933e59bdcb4aafc173874b 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -247,7 +247,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x120c>;
+       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -258,8 +259,23 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x520c>;
+       nvmem-cells = <&macaddr_art_520c>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 
        phy-handle = <&phy4>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_120c: macaddr@120c {
+               reg = <0x120c 0x6>;
+       };
+
+       macaddr_art_520c: macaddr@520c {
+               reg = <0x520c 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index 3d11e641eb8be8e94f601df254ff4eb8a2282a37..d672364e562edfa83e3f3a72da727b38dd431c71 100644 (file)
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -81,7 +81,8 @@
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&config 0x66>;
+               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -91,7 +92,8 @@
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&config 0x66>;
+               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <2>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -114,7 +116,8 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&config 0x66>;
+       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cell-names = "mac-address";
 
        pll-data = <0x00110000 0x00001099 0x00991099>;
 
@@ -167,3 +170,13 @@
                };
        };
 };
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_66: macaddr@66 {
+               reg = <0x66 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index c7e83631cce2040d636b8556216724cc050fba68..369c89a97e90c8decda51422c45747c74d38777e 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -153,7 +153,7 @@
        ath9k0: wifi@0,11 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               mtd-mac-address = <&art 0xc>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
@@ -181,7 +181,7 @@
        ath9k1: wifi@0,12 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
-               mtd-mac-address = <&art 0xc>;
+               mtd-mac-address = <&art 0x0>;
                qca,no-eeprom;
                #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 7f736dc005346256633cb1d87dbdd09c31f155b5..cf51078bc32ba5f5e0904cc46c9087853d25aa61 100644 (file)
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -153,13 +153,15 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x120c>;
+       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x120c>;
+       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -170,7 +172,8 @@
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&art 0x120c>;
+               nvmem-cells = <&macaddr_art_120c>;
+               nvmem-cell-names = "mac-address";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -181,3 +184,13 @@
                pinctrl-single,bits = <0x0 0x0 0xf8>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_120c: macaddr@120c {
+               reg = <0x120c 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
index c5a667b51394c58b808c3e2ba65d838d4558d5fb..9a233c836b7c25908e2e2f559f9898353f3ee412 100644 (file)
--- a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
+++ b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
@@ -72,13 +72,15 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -92,3 +94,13 @@
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index 931032d851b722854f7e5cd2039e511dc94c0fca..91b72cf1db8961fd133af5748876718ac5b40bf1 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -174,13 +174,15 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -189,10 +191,25 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 91438ebf8fdbbab9e4af45ef9378f546fa4f9c72..9bae95b5575d54ad5b267c71df9318cdfbb61054 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -107,13 +107,15 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -122,10 +124,25 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7240_tplink.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi
index 4799fd79ec7754840aeab426c2250eeea00bc250..60cd38c220cb4fdbeae61ccefda4446e2ca250da 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink.dtsi
@@ -104,7 +104,8 @@
        ath9k: wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&uboot 0x1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cell-names = "mac-address";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -115,3 +116,13 @@
                pinctrl-single,bits = <0x0 0x0 0xf8>;
        };
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
index e0ac582f9dcf2e04818f9c49b27633e7ca01e26e..ceb6b1d7a20dc168cd015c011e99ee156dd0b78d 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
@@ -14,9 +14,20 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &ath9k {
        compatible = "pci168c,002a";
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
index adc6cc87b3281c7a502c8869d1664564b2336ee1..40a2ca239905a595034200c57e7b0248803c6057 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,27 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &ath9k {
        compatible = "pci168c,002b";
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index 380f82a59f4d69412bded5185618398fd4484ca0..290871d648e668e32602dd7bdd7032c3b5f2b8b6 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -179,13 +179,15 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -194,10 +196,25 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002e";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index c2c81b3a872b120092a01d7ada1a317985d4cc8a..84a9a4f63d6f9e10ed788281d9af3bbd90375602 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -89,18 +89,31 @@
                #gpio-cells = <2>;
                gpio-controller;
                qca,no-eeprom;
-               mtd-mac-address = <&uboot 0x1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cell-names = "mac-address";
        };
 };
 
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

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 4cc6d2a8f134ec26a5ad5c24c44014806065c39a..df77ca0fdc0bf3c0e64bbfac176a1448d75e0d8f 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -135,18 +135,31 @@
                #gpio-cells = <2>;
                gpio-controller;
                qca,no-eeprom;
-               mtd-mac-address = <&uboot 0x1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cell-names = "mac-address";
        };
 };
 
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
index 68f83f7a665a348cead35afab8b9a3d4ac19ae4a..3a0cc4250ed2b51fccb075344fd7a348cd1e036a 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
@@ -94,9 +94,20 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wifi {
        ubnt,hsr;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
index 73ded0f5bd83c7a33ac4bdf4bbf25ac32df8e0bc..614ac1454f34aec584c61a7f16249c71b8a9ee87 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
@@ -45,4 +45,3 @@
 
        mtd-mac-address = <&art 0x0>;
 };
-

diff --git a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
index 3b2dc0ecfc44eff92880d8e5a1891bb2e02715fb..dde91295052f7ae1fb64869433ea9d9e0f79f087 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
@@ -15,5 +15,16 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
index 111d06491ec9939d0e11b25f462611fa9a4d1c25..fa3c47354e8d8731468baa7960ab86989e6b61d0 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
@@ -192,7 +192,8 @@
 
        pll-data = <0x1c000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x120c>;
+       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -204,7 +205,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x120c>;
+               nvmem-cells = <&macaddr_art_120c>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
@@ -229,3 +231,13 @@
                #trigger-source-cells = <0>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_120c: macaddr@120c {
+               reg = <0x120c 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
index 4f186c2c11d6b87fa9137afc5f1a834b2d0c19ce..84d029b5dce2ff28816200c90c973bf898a88a2e 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
@@ -64,7 +64,8 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -73,9 +74,20 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x1002>;
+               nvmem-cells = <&macaddr_art_1002>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
index 3e2a67697f17d7c62f7f53c0b49ab319d977e607..7458685802b835260a4ad2d51745be96927a3c59 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,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
        phy-mode = "rgmii-id";
@@ -77,10 +78,21 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
index 9026eb997fc78a2934a7d23668558ffb9f26cdb9..f1f86019dd9bfef9444ef1e3ec08dda1acdeab4f 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,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
        phy-mode = "rgmii-id";
@@ -77,10 +78,21 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <(-1)>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_meraki_mr12.dts b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
index 8a19bffe6ec36f89d004082cdbd1655951e96cdf..5e82b5bb6bcedd70e890f53a0b78a2b81eede5e2 100644 (file)
--- a/target/linux/ath79/dts/ar7242_meraki_mr12.dts
+++ b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
@@ -81,7 +81,8 @@
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&config 0x66>;
+               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <1>;
        };
 };
@@ -101,7 +102,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x66>;
+       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cell-names = "mac-address";
 
        pll-data = <0x02000000 0x00000101 0x00001313>;
 
@@ -116,7 +118,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x66>;
+       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cell-names = "mac-address";
 };
 
 &spi {
@@ -164,3 +167,13 @@
                };
        };
 };
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_66: macaddr@66 {
+               reg = <0x66 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
index 01f4cb7fde6da052ce998a19f93534546cd6175c..ae4867521a7fd7b6c7c7d9d72dfe46477d480f5b 100644 (file)
--- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
+++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
@@ -157,7 +157,8 @@
                #gpio-cells = <2>;
                gpio-controller;
                qca,no-eeprom;
-               mtd-mac-address = <&uboot 0x1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cell-names = "mac-address";
        };
 };
 
@@ -165,7 +166,8 @@
        status = "okay";
 
        phy-mode = "rgmii";
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy0>;
        fixed-link {
@@ -173,3 +175,13 @@
                full-duplex;
        };
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts
index 85e85d84158ee6fb5ecae4b3cf42630a53018df2..b353e76028814253ba8bab1d395b7f384fba37d2 100644 (file)
--- a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts
+++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts
@@ -67,10 +67,21 @@
        phy-handle = <&phy0>;
        phy-mode = "rgmii";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
                full-duplex;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
index b640badb32f60b9fe1d22f8c330f20a4c2710d1a..ec17d59d1a3f2e3abd8ff5a2c699174d72a934b3 100644 (file)
--- a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
+++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
@@ -179,7 +179,8 @@
 
        phy-mode = "rgmii-rxid";
        pll-data = <0x16000000 0x00000101 0x00001313>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy0>;
        fixed-link {
@@ -187,3 +188,13 @@
                full-duplex;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
index caae72c91f489f9e0a04b2e670272c5609a4de11..3f996a16c757b61c042d87b59418a7af16342701 100644 (file)
--- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
+++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
@@ -131,5 +131,16 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi b/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi
index 77dbfc4ac33835139a75bbfadf904509d02fbf8d..341d0bad0d6f700abfc4bbee69c776ed21839c93 100644 (file)
--- a/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi
@@ -79,11 +79,27 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
index 9bd4656d85e6db92ed2e5dde8e39f35ffa3eca19..ca1eeab4494f8c60fa6293f42318e77d2e95e955 100644 (file)
--- a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
+++ b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
@@ -188,7 +188,8 @@
        status = "disabled";
 
        phy-mode = "rgmii";
-       mtd-mac-address = <&art 0x1120c>;
+       nvmem-cells = <&macaddr_art_1120c>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -215,7 +216,8 @@
        resets = <&rst 13>;
        reset-names = "mac";
        qca,mac-idx = <1>;
-       mtd-mac-address = <&art 0x1120c>;
+       nvmem-cells = <&macaddr_art_1120c>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -247,3 +249,13 @@
 &usb_phy {
        status = "okay";
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1120c: macaddr@1120c {
+               reg = <0x1120c 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
index 606572aaba177169c66d8d71c6ea17deba626e44..354213c440487a13035c0178b3fac2808e18839c 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
@@ -118,7 +118,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy12>;
 };
@@ -127,5 +128,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index 3b406e4d80daa3c2a88ffd1ddc8159bff699828f..12e417d3a479f91a5827eacb5fbc96b40bb6b605 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -137,7 +137,8 @@
        status = "okay";
 
        phy-mode = "rgmii";
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -149,5 +150,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index 821c2aec66691b179130870d4cd95ffc4cedb36e..58586eb03615b3ef959631824fcead21e077e12b 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -144,7 +144,8 @@
        status = "okay";
 
        phy-mode = "rmii";
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <100>;
@@ -155,5 +156,16 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
index 6a13c1bafe5840178e52dba37f6fef65e2364daa..b31d0f961b3ef1f2380d051046ef64c937e2952d 100644 (file)
--- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
@@ -113,13 +113,15 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -133,5 +135,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
index 4f428cbb17fd8f0036b7b175a73fd8a7adfc2c58..e010e5cad0c133a402ecaa05ae68b34ad6637ef9 100644 (file)
--- a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
+++ b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
@@ -130,13 +130,15 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -144,3 +146,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
index 607ee5f6c97344377176fab2e581a52432ff30eb..5383d6588477b3bc3816637339372d5e9001f33b 100644 (file)
--- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
+++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
@@ -112,7 +112,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -132,5 +133,20 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x2>;
+       nvmem-cells = <&macaddr_art_2>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_2: macaddr@2 {
+               reg = <0x2 0x6>;
+       };
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
index 19a7390977748c1d02f9f86f1fa9d3d836317eba..5801044f4e8202da2ebd8ea44a1e89a7f6ba6129 100644 (file)
--- a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
+++ b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
@@ -86,14 +86,16 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
-       mtd-mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <2>;
 };
 
 &wmac {
@@ -101,3 +103,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index ba01d25d5828f470a04c4d5c18a72d31965889b9..d99e0a422a70471b6d360fd35e2b3c44e331d86b 100644 (file)
--- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
+++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
@@ -103,7 +103,8 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -115,10 +116,25 @@
 
 &eth1 {
        status = "okay";
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
index 7734f20e04ef611334e43aff3ed258a494835f39..e12205c310e7efcc78c48d9d015dc7def0460a23 100644 (file)
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
@@ -55,7 +55,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -123,3 +124,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index b14e70c132dafd3521f1236e7959356a55b57fd8..de6b709b5cb65a09d12a4b1f934eae9b76d324ae 100644 (file)
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -93,7 +93,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment-byte = <3>;
        mac-address-increment = <0x40>;
 };
@@ -107,3 +108,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index 95c8a10e0d46e8f0dda252fb950d3b29f08d31cf..402fca80a1eacb63db0a3681953641393930891e 100644 (file)
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -63,7 +63,8 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -117,3 +118,13 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
index 7d6e7bd4af06c0b02d1a3f8115cbf96eb312c739..e5460b299df17bcd446863481473e14871ec631b 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
@@ -121,7 +121,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -134,7 +135,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -142,3 +144,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
index d1c265471256ffe2643bcc8a420d1428b390f9eb..6f332dd99b3aedd28b3d4c9d77c9355e3bf27c80 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
@@ -58,7 +58,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -117,3 +118,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
index 261657312b732ff75b836eabafb1b7dad1a69c7c..69d974eb53843234ccf62b29bd379fba3db81691 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
+++ b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
@@ -24,7 +24,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 
        gmac-config {
@@ -38,7 +39,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -90,3 +92,13 @@
 &usb_phy {
        status = "okay";
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
index 62d5caeb9df00f2f5f9077fca180c753380f1530..0502d5d14ce26f44aac06ea7dc9ed8c10d995cf1 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
+++ b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
@@ -62,7 +62,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -119,3 +120,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
index 873762088a16cd8e2fa3478662f751e02734a060..58ef4ab0910cd22fe220c15f72ab4d3393ffbd57 100644 (file)
--- a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
@@ -75,7 +75,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -102,5 +103,16 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
index 3a18249aa6fcf9a1e7463c11f6d1e2b7f8b3f6cc..f438567e52c83f869561a1ae012079fdba89bd04 100644 (file)
--- a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
@@ -83,7 +83,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -111,5 +112,16 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts b/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
index c394cf1cb853318871f0dd2915784c28d396c801..1858c74272b1376dbca7d7202d81a8d9ba8c25d0 100644 (file)
--- a/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
+++ b/target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts
@@ -109,14 +109,16 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x0>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x0>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 };
 
 &spi {
@@ -188,6 +190,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&config 0x0>;
-       mtd-mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <2>;
+};
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 7df4ed9a986b8450b94fc170a7b22bbbc2bc56aa..c420c1a4cd5195dd633ff5846fd548ae52191d5c 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -146,7 +146,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        gmac-config {
                device = <&gmac>;
 
@@ -165,5 +166,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index 6c353379b79a2f0739aeb54d738d7e83f531f1e6..619fd09ee99443ae9e18338ff52a5a3a4b4be917 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -135,7 +135,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        gmac-config {
                device = <&gmac>;
 
@@ -154,5 +155,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
index e31640b87f5b92d51e779a9925b71a4ca2c50079..5fda458fbc34e7b9e43ec818ae4597b95b37622a 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
@@ -80,7 +80,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -110,5 +111,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

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 248a2b646e3e149f16a84a7d01875cff95318cc8..b74b8251ce5c0a3c86b1b92f6f59d3c94b9ee605 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -121,7 +121,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 
        gmac-config {
@@ -135,7 +136,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -143,5 +145,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
index 8c87a73508dd0b37d8313a9d94579d1d1e6d51b2..4a993c9301209e4ed7cf33b2e15067fd037ce505 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
@@ -46,7 +46,8 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -54,3 +55,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 5c81020ccdfe94896f7c5d827b39bc1eae9f3b06..ec574ccf9f0e9e0c845e87752628099010c3fc12 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -65,13 +65,15 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -84,3 +86,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
index 727064def3f9bb0de7c6e48f44531a73363b71ad..2dfdff03d8271cc8f77e4753de719749addc70bd 100644 (file)
--- a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
+++ b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
@@ -142,11 +142,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -154,3 +156,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index f822c69aeeeac15d6ae10ac8ae23061822e00421..4e4daef1c8e65eaa4b3e55e219a2901d63c4e0c7 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -133,7 +133,8 @@
        status = "okay";
 
        phy-handle = <&swphy0>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -141,10 +142,21 @@
        phy-handle = <&swphy4>;
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
                switch-phy-swap = <1>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
index ffa52b437cbf44c35edd1035e2b0c92a61fb6583..23b5cf745044f8eed2f42e3eddcd77e27f55dc92 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
+++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
@@ -188,7 +188,8 @@
 &eth0 {
        status = "okay";
        phy-handle = <&swphy4>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -213,3 +214,13 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
index 499ef982018d699c4fc93ce314b0217dc7e5ce1a..5d5b88c5f3b99eb620444363950a796dc58ea1d6 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi
@@ -54,7 +54,8 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -71,5 +72,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts
index 01bc487626f1f77221106403666d21f00c68b1d0..25adac4e8ade2acb63edc8fb3a15b51bc0280563 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts
@@ -96,7 +96,8 @@
        /* default for ar934x, except for 1000M and 10M */
        pll-data = <0x06000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -111,3 +112,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi
index 918b69c1dad74ef208f86fe775b09639b32f4f58..bd6feb3d787714732e726cb25b2a64d843b544e8 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi
@@ -18,7 +18,8 @@
        /* default for ar934x, except for 1000M and 10M */
        pll-data = <0x02000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
        phy-handle = <&phy4>;
@@ -29,3 +30,13 @@
                rxdv-delay = <3>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi
index f2e936bcc40766611873512b57657e707149f7f7..5024a140f3d095bc4f951a6cff9287def02a316c 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi
@@ -26,7 +26,8 @@
        /* default for ar934x, except for 1000M and 10M */
        pll-data = <0x06000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -37,3 +38,13 @@
                rxdv-delay = <2>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
index 3089e6b341fb9aa63d1b3b19f004b4b53870d532..ce49c10e5ccb5bc634444cd2dbbce1deb60ef73c 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
@@ -110,5 +110,16 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
index 2f871943758a79b5acb68e473f01b319757bf24b..a2ac53b9963785c8be2edf643259fe029ca01fbd 100644 (file)
--- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
+++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
@@ -106,7 +106,8 @@
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
 
-               mtd-mac-address = <&hw_info 0x0>;
+               nvmem-cells = <&macaddr_hw_info_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <2>;
        };
 };
@@ -160,7 +161,8 @@
 &wmac {
        status = "okay";
 
-       mtd-mac-address = <&hw_info 0x0>;
+       nvmem-cells = <&macaddr_hw_info_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -215,7 +217,8 @@
 
        pll-data = <0x06000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&hw_info 0x0>;
+       nvmem-cells = <&macaddr_hw_info_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
@@ -227,3 +230,13 @@
                rxdv-delay = <1>;
        };
 };
+
+&hw_info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_hw_info_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
index 486e109c8f2fab0369fc24cfc7a2b3f1563875e6..c54270a78dc2f4e0d0010b769d844e12484ca966 100644 (file)
--- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
+++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
@@ -90,14 +90,16 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&swphy4>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &ref {
@@ -149,3 +151,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
index 73e06370f83de5127d95bcd170a531d5bf0c654c..94a82baddcdc0ffc7a93339709b8fc405bc03470 100644 (file)
--- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
+++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
@@ -120,7 +120,8 @@
 &eth0 {
        status = "okay";
        phy-handle = <&swphy0>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -130,10 +131,25 @@
 
 &eth1 {
        status = "okay";
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
index 96549ec2ca828f9c99f93cb6e6434eed3a2a6c78..8d42f0c21163de3dcbcdf3796947a12c5bcf3505 100644 (file)
--- a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
+++ b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
@@ -139,8 +139,19 @@
 
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&uboot 0x2e010>;
+       nvmem-cells = <&macaddr_uboot_2e010>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_2e010: macaddr@2e010 {
+               reg = <0x2e010 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
index b61ab75ae8e347bd3fc68a2b6131276e471fcb07..1cec6625692672bbc186cc591dd3b92bcad279b8 100644 (file)
--- a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
+++ b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
@@ -130,7 +130,8 @@
 
        pll-data = <0x02000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 
        phy-mode = "rgmii";
@@ -168,3 +169,13 @@
                >;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
index b25e3be17f179a3a508cbb5dc5ac12ca643098a9..5ad8078f83f39d29b67ca5cb463922cc2b50ea2e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
@@ -29,17 +29,30 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-2)>;
 };
 
 &pcie {
        wifi@0,0,0 {
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
        };
 };
 
 &wmac {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index 6c7a99c47778e9a99450d4af44c2f9cdb3146a42..e064994dba614a87c823950dae94fee28f321d1e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -24,17 +24,30 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
        wifi@0,0,0 {
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <(-2)>;
        };
 };
 
 &wmac {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 52425a071cd6e9b5051719b746379c6a9c110aba..c075c38557e959eefd4976148c06c539f0d644b1 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -219,7 +219,8 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&caldata 0x0>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -244,7 +245,8 @@
 &wmac {
        status = "okay";
 
-       mtd-mac-address = <&caldata 0x0>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
        qca,no-eeprom;
 };
 
@@ -254,9 +256,24 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&caldata 0xc>;
+               nvmem-cells = <&macaddr_caldata_c>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
+
+&caldata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_caldata_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_caldata_c: macaddr@c {
+               reg = <0xc 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
index cf02b711fa501d13143dedcb723f43d40f691e88..e5e206784609fa3a6fd73a8dbe84961cc787403c 100644 (file)
--- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
+++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
@@ -129,7 +129,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0xc>;
+               nvmem-cells = <&macaddr_art_c>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
@@ -140,7 +141,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio0 {
@@ -158,8 +160,27 @@
 
        pll-data = <0x06000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+
+       macaddr_art_c: macaddr@c {
+               reg = <0xc 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
index 6a7af59147b3593af8000c4d11a7fb11ac02314b..de8bfb70b7482b3a8262afda36f0f7f27e3f9681 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
@@ -96,7 +96,8 @@
 
        pll-data = <0x02000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
        phy-handle = <&phy0>;
@@ -113,7 +114,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -124,7 +126,18 @@
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <8>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
index 636595c9ee58a6ed7aabbb604d92ec7848bda96e..3e60d05ed32f5c37cc6929deda808625e1c8013c 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
@@ -145,13 +145,15 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -159,3 +161,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index 4125a40269203ac50ed71d4f956a5321e16bafd9..1f15a2e8b82a81744223286b5e4890ef11f0c0b1 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -118,7 +118,8 @@
        ath9k: wifi@0,0 {
                compatible = "168c,0030";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <(-2)>;
                mtd-cal-data = <&art 0x5000>;
                qca,no-eeprom;
@@ -133,7 +134,8 @@
 
        qca,disable-2ghz;
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -154,8 +156,19 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index 9aaabd0c246e46acdf11224af484b24d819f0d7e..7b99ef7373e76854f7958488d05cc7633de0976a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -125,7 +125,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x5002>;
+               nvmem-cells = <&macaddr_art_5002>;
+               nvmem-cell-names = "mac-address";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -159,7 +160,8 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -209,3 +211,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_5002: macaddr@5002 {
+               reg = <0x5002 0x6>;
+       };
+};

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 366a0f720ad6f7a8692978928ce7c50aebb2aa5e..7c2f90e72c3a78836cf5d090c4d9990e923172e7 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,14 +24,16 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -47,3 +49,13 @@
                reg = <0x070000 0xf90000>;
        };
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

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 994b842f346fe66ca7bb7e795b9daea8725191aa..042974610ca09c7114f0c85cb2eaaee0f969deb1 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,14 +24,16 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -47,3 +49,13 @@
                reg = <0x070000 0x790000>;
        };
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

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 fb200fae3515e18aac2bbb86c63c34b5c01b2334..195ab9db20e22e65f0c50afca2f57243d4a820fb 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-16m.dts
@@ -33,7 +33,8 @@
 
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -46,3 +47,13 @@
                reg = <0x070000 0xf90000>;
        };
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

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 75ef13ec13ed284403e659f48e5200c4108b3ab6..b81a7f777863b0605ee929cace6c26affd8ab74a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750g-v8-8m.dts
@@ -33,7 +33,8 @@
 
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -46,3 +47,13 @@
                reg = <0x070000 0x790000>;
        };
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_samsung_wam250.dts b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
index bca757e77fec5105bff01046fbace6cc3aa51d86..fd5bf9e81d46acbbafece517c8f54f3082a36766 100644 (file)
--- a/target/linux/ath79/dts/ar9344_samsung_wam250.dts
+++ b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
@@ -66,7 +66,8 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 
        gmac-config {
@@ -78,7 +79,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
 };
 
 &gpio {
@@ -154,3 +156,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
index 22c2163fecb3d60941d79b5aae401d2e926925b7..e017ae230831ac6a4c525abc5a87b4256b563998 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
@@ -164,14 +164,16 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&config 0x0>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x0>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &builtin_switch {
@@ -190,3 +192,13 @@
                pinctrl-single,bits = <0x0 0x002e0000 0x00ff0000>;
        };
 };
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
index 28dbb74511940f5f9cbe9b6d4c15b62f07fb0657..56821fccdea48c6879395d6b03748a3462f6e48c 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
@@ -163,14 +163,16 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&config 0x0>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x0>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &builtin_switch {
@@ -186,3 +188,13 @@
                                        <0x14 0x08 0xff>;
        };
 };
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
index 53fe69ae0006c536c6781ed482ca5aa188ba5e56..c989a30b108500a5b91d0512d3ed9aaba4d4c7f4 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
@@ -147,7 +147,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&config 0x0>;
+       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
 
@@ -171,3 +172,13 @@
                                        <0x3c 0x000b0000 0x00ff0000>;
        };
 };
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
index fd6aa0f08bef73b9557728c96547e0a91e205464..9d8873ddaf1b3232aee81e59f3f522ac9b3a9b73 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
@@ -84,7 +84,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth0 {
@@ -92,7 +93,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -114,3 +116,13 @@
                line-name = "tp-link:ext:lna1";
        };
 };
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
index e7d33ab22be280cfa6b81aeeab1f445e0b79ec50..d539d2e0a6e578be1a0f4eb76251aca3a45a510b 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
@@ -45,7 +45,8 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -53,3 +54,13 @@
                switch-only-mode = <1>;
        };
 };
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
+};

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 e8f9672b58c97fbe992ed716a004c47be543b000..6c5d013ccd61026ea9761d86ab1d96ce442d9535 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
@@ -57,18 +57,21 @@
 };
 
 &ath9k {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &wmac {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 
        gmac-config {
@@ -83,6 +86,17 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index f8b4d0385afe69b6401d3c28cc2863cfea0c7aac..262c6f713e93ff735a63a99291e0588060d6d5d1 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -80,11 +80,13 @@
 };
 
 &ath9k {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -115,8 +117,19 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
index 4612ae1a669c80d80fc3f7dca3944501669928a2..8471be9b6b83a6bf277e1909398ed1c957355a33 100644 (file)
--- a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
+++ b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
@@ -144,8 +144,19 @@
 
        pll-data = <0x6000000 0x101 0x1616>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index 87bbd206b2ce05cb1d7c95bb315ea4d8c1ae18cb..2586a174cb93b08d93bc423cb8060653958279d2 100644 (file)
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -141,7 +141,8 @@
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&addr 0x0>;
+               nvmem-cells = <&macaddr_addr_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <0x10>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -179,7 +180,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&addr 0x0>;
+       nvmem-cells = <&macaddr_addr_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio0 {
@@ -197,7 +199,8 @@
 
        pll-data = <0xe000000 0x04000101 0x04001313>;
 
-       mtd-mac-address = <&addr 0x0>;
+       nvmem-cells = <&macaddr_addr_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <0x21>;
 
        phy-mode = "rgmii-rxid";
@@ -210,3 +213,13 @@
                rxdv-delay = <1>;
        };
 };
+
+&addr {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_addr_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
index a3b4534cb5b9bc9965aceea91d6766a9f0c0f644..8fc21be1dcb4965f886d483b72d09f31d6cc7383 100644 (file)
--- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
+++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
@@ -84,12 +84,14 @@
 &eth0 {
        status = "okay";
        phy-handle = <&swphy4>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &spi {
@@ -150,3 +152,17 @@
                pinctrl-single,bits = <0x14 0x0 0xff00>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts
index 7fc84a6787408e9a73e89328fed9f5fe2c534572..5a21251d6d3e63631ef2cdd6ddc9fbfb0f7348bb 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_lima.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts
@@ -87,7 +87,8 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -98,7 +99,8 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -106,3 +108,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
index 4f0e371c229e845acf75ec85e56bb3549ddbec9f..671adb8ccf8ee7bd954d7d8c62eb2757e23a1378 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,27 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-2)>;
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
 &pcie0 {
        status = "okay";
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

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 4288e92fcdea773c56f94c78f111144c22e0faae..5a934ce957cdcd95081327c83f4e717362dd6197 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,7 +45,8 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -85,3 +86,13 @@
                #trigger-source-cells = <0>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
index 1effb4485b61fa2da0d13ebcf7d3bed342b209f9..01e14bb0b138c93c64d85118145cdccfb82677b1 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
@@ -50,7 +50,8 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-2)>;
 };
 
@@ -59,7 +60,8 @@
         * (GMAC0 -> eth0, GMAC1 -> eth1, same as in old ar71xx target) */
        compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -79,3 +81,13 @@
                debounce-interval = <60>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
index e14cf772af119e6402fa385fb54bfe736ad5c097..4a84e150ae6596c2893270d5e3b15707a50e395e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
@@ -118,7 +118,8 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -129,6 +130,17 @@
 &wmac {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
index 757a2eaeeebc9df70bbba231af821757edbb2266..c187521351919c9a809028536779c67e540a7889 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
@@ -121,7 +121,8 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -130,7 +131,8 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie0 {
@@ -141,3 +143,17 @@
                reg = <0 0 0 0 0>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index 4738ba56af5adebb5ecbb55bbcaf536d123c97b1..c182390b21730cdc4a66857cca589467b7f4c917 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -136,14 +136,30 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index 57727754bba4d4a52f741a3cf155f7faafddc6b6..d83972525855de2859d50a0da035726a041438d4 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -121,11 +121,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -139,3 +141,17 @@
                pinctrl-single,bits = <0x4 0x0 0xff>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 634d20015d92476ab6159f9b137f216e24f522f9..477a2bddc6b475f1b2c36c7fa331923a61dc7bcd 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -150,18 +150,31 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <10>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index f67a8cbb728c08227bae1bc0a168eb0a54f9a438..e5024b39f94fdaeff851e38bb1d045c56c72bf54 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -109,18 +109,31 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <3>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

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 44c85b62e199ce218d40b65d36b1eb40f6349ea0..fc2f6de111410e27c65ef3a4c945ca5064354c7f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -109,7 +109,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -121,6 +122,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <10>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
index 89822586ffda095503f0351861b4710a7a9e691c..16a2794b9732b2e6edd022e3588e542b758ba197 100644 (file)
--- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
+++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
@@ -105,11 +105,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x2e010>;
+       nvmem-cells = <&macaddr_uboot_2e010>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x2e018>;
+       nvmem-cells = <&macaddr_uboot_2e018>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -134,3 +136,17 @@
 &usb0 {
        status = "okay";
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_2e010: macaddr@2e010 {
+               reg = <0x2e010 0x6>;
+       };
+
+       macaddr_uboot_2e018: macaddr@2e018 {
+               reg = <0x2e018 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 3b20fa51ab54b7890ed1f8bc0a0c72d75f9bd5bd..d4e1e6b2374d7ebaeac3b854f192921d55468207 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -146,11 +146,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -158,3 +160,13 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index 80623085f085f6d4cfd005e634c15e52598ddd8f..60bd2922a2d722470508567d659f497394233517 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -129,11 +129,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -142,3 +144,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
index 98022d7cc5ce3ef6ae41a86f9dd89ccd68bffb51..ca0784e6bf60f6b32720043fa674d090386b8d38 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
@@ -120,7 +120,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -132,3 +133,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index 8cb611c11d586e9773786b5f884cfd2936f8f3fc..7fd622a8c5f15e6119d30c1ec28cee22a4c3bfa8 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -118,11 +118,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -131,3 +133,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
index 6423ae02722e39a8fcc80f6c46ef19a2aa96493c..ce515159b1501b5356c20e20aec2b5e62f6fe554 100644 (file)
--- a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
+++ b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
@@ -95,12 +95,14 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -108,3 +110,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts
index eaaf4f154c842998a2b8672505b94075d3269a2a..540de60377e2ff5227e0b3b08cf5b6194fbde925 100644 (file)
--- a/target/linux/ath79/dts/qca9531_telco_t1.dts
+++ b/target/linux/ath79/dts/qca9531_telco_t1.dts
@@ -118,11 +118,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -136,3 +138,17 @@
                pinctrl-single,bits = <0x4 0x0 0xff>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

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 1113c51be5ce8fbf92027f5b902ff236e67ac784..27b70e082af4a28c315a8af8308689189cd1e4d3 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -146,19 +146,22 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&romfile 0xf100>;
+       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&romfile 0xf100>;
+       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&romfile 0xf100>;
+       nvmem-cells = <&macaddr_romfile_f100>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie0 {
@@ -184,3 +187,13 @@
                #trigger-source-cells = <0>;
        };
 };
+
+&romfile {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_romfile_f100: macaddr@f100 {
+               reg = <0xf100 0x6>;
+       };
+};

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 4c730375a69e6fe5085ab21396e9917512cd1672..818ec7769527970feaf38f6660c9b875c7eded5e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -171,19 +171,22 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &usb0 {
@@ -200,3 +203,13 @@
 &usb_phy {
        status = "okay";
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

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 47d9e0846afdb140dc0aadd90128a5d2f4837cc9..ca7832ebd49a54491f6a85186b6ad063a3a0cbb4 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -128,12 +128,14 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -141,7 +143,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &usb0 {
@@ -158,3 +161,13 @@
 &usb_phy {
        status = "okay";
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

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 a769a81d580d3fea03f0d654daea7dd54b444728..7ce8cd30cdf947c9b720ee25a218560edaffb2d9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -147,7 +147,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -159,7 +160,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie0 {
@@ -185,3 +187,13 @@
                #trigger-source-cells = <0>;
        };
 };
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_wallys_dr531.dts b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
index abf821b11b505ee2f1953fd52987dc37b4f6e9f9..9982914442d3b7f36941847c4038c56a15a604a6 100644 (file)
--- a/target/linux/ath79/dts/qca9531_wallys_dr531.dts
+++ b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
@@ -76,7 +76,8 @@
        status = "okay";
 
        phy-handle = <&swphy4>;
-       mtd-mac-address = <&env 0xf818>;
+       nvmem-cells = <&macaddr_env_f818>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -84,7 +85,8 @@
         * (GMAC0 -> eth0, GMAC1 -> eth1, same as in old ar71xx target) */
        compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
-       mtd-mac-address = <&env 0xf810>;
+       nvmem-cells = <&macaddr_env_f810>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie0 {
@@ -150,3 +152,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&env {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_env_f810: macaddr@f810 {
+               reg = <0xf810 0x6>;
+       };
+
+       macaddr_env_f818: macaddr@f818 {
+               reg = <0xf818 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index c58b0c4e38d62eab544f67d6d92255cad8013018..a255342015af1571846b82fb15fa39950a60eac6 100644 (file)
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -98,11 +98,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie0 {
@@ -114,3 +116,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
index 8deeea4245012580e77e7e2521dedb6fa04b9b63..64df0cff7c5f8654bcfc53cb3b9df00439136716 100644 (file)
--- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
+++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
@@ -134,11 +134,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x1002>;
+       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -149,5 +151,24 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+
+       macaddr_art_1002: macaddr@1002 {
+               reg = <0x1002 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
index e38fc9378aae674e8a286b45e5b33e4d40934caa..8a51d6b6d6597f2639f09551f790eb85aea8c900 100644 (file)
--- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
+++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
@@ -132,7 +132,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -141,13 +142,29 @@
         */
        compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
index 6df843f143dde2a0b72ea3d1017c427e48855ea8..602365f45d8579c18c33fa4be2916f20aba8dbdf 100644 (file)
--- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
+++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
@@ -114,7 +114,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -123,7 +124,8 @@
         */
        compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -131,6 +133,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
index 1d8098944a1af8bbf34a1e69bd87fd4ca31e6a78..fb31aa2872879d13b7679b0c2ab5cd3e5c58ccd6 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
@@ -20,7 +20,8 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -28,3 +29,13 @@
                switch-only-mode = <1>;
        };
 };
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index d5eeec13b7770014081c6de57708d89e8ffb208e..3f3fae1dfd70f51dcad7dc2f379d952c22b5b690 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -108,12 +108,24 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
index 6033acddf3afc4e0f138436582bfdcd1242e066a..43db72ec650895868cba383d1e7d1c6007a3a5b3 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -102,7 +102,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -113,5 +114,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index 45fe9e86b3d5ee1e93111116d4385985ae9f6f53..e7d837a5740b89bceb965040dd7f8a2f13ebd4c0 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -150,7 +150,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -161,5 +162,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index 1835cbcb96e8c3c7034af4ac99fbe6a4769e868c..4be1ced4b215521d77d6f9ac73ba734e70d5b973 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -73,7 +73,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -85,5 +86,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index df68a56d4774d01bb20ad2ac22d3445d35af9f30..c9c109ee392bfb00dd4b4373c7ae8a4d30982aeb 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -108,17 +108,30 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

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 7170601f6ae5d01d043932e9498af8352aee53dc..07b706251a349b207dd9a319e67bf460ccd5fa62 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
@@ -130,17 +130,30 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

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 cb93afa233d73ac6f49e26037d41b64cd20f9cfa..e171984511dffda9f3fbc5012aeefe70a933c4cf 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -148,17 +148,30 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
index f7910b3d6f8939ac7a0634c3af61fadcaf1b814f..e854f3700cd0a132df479718286a08af1760e9b4 100644 (file)
--- a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
+++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
@@ -76,11 +76,13 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -91,3 +93,17 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index 27d9681eadd9235657e83f99ad8da5671a641691..e49b8fc1ca051b1430f636f5d0ce29ec1107273d 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -90,17 +90,30 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
index a984b38ad279c4ecfd17d7f1e04fb7a97772510a..01217534454040076307475639c9503d2658c709 100644 (file)
--- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
@@ -63,7 +63,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
 };
@@ -87,7 +88,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
        fixed-link {
@@ -179,3 +181,17 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
index 638d78a7a5fead370b0d990ee7ac3c5844003f33..2724c3a1b67dd451ebfe5a5e3cb1ac14f3da03ca 100644 (file)
--- a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
+++ b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
@@ -77,7 +77,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "mii";
        phy-handle = <&phy0>;
 };
@@ -88,7 +89,8 @@
        pll-data = <0x17000000 0x101 0x1313>;
        phy-handle = <&phy1>;
        qca955x-sgmii-fixup;
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -123,3 +125,17 @@
        #address-cells = <1>;
        #size-cells = <0>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index dce1a2144ff465b05a4863a60cd73377be7079c6..a4e2a615f6404a7a48954b0a940ea690b99e13f2 100644 (file)
--- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
+++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
@@ -118,7 +118,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
        pll-data = <0x56000000 0x00000101 0x00001616>;
 };
@@ -126,7 +127,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
        fixed-link {
@@ -134,3 +136,17 @@
                full-duplex;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 0b006bcffb5635e7da940fb44d6be99f8fbb8492..3b3a3e3c3d2d51aa3abda3cd9e548276dbabe715 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
@@ -77,7 +77,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
        phy-mode = "rgmii-id";
@@ -89,6 +90,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
index 9a45bd4277e999a83c27a5c957b85200f298c4c8..812fcfc5dcbf89ad6436e8887db1c93e2866d9ba 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
@@ -88,7 +88,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy1>;
        phy-mode = "rgmii-id";
@@ -99,7 +100,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 
        phy-handle = <&phy2>;
@@ -108,3 +110,13 @@
 
        qca955x-sgmii-fixup;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
index 3b9e25e3e8f2b42e6076476d299352cc5a2eb6f7..aa1f4ad02bdd40ac20d0ce30f91e54aec27acfb4 100644 (file)
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -59,7 +59,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
        phy-mode = "rgmii-id";
@@ -89,7 +90,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
-       qca-no-eeprom;
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index 81c2c0866f15e89945e119a5bc5fb7445ed31980..23fe321efbf9c2dad27af9110a82640ebb938526 100644 (file)
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -185,7 +185,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
 
@@ -198,7 +199,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
@@ -222,3 +224,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index 85617cc809997782d6b339b7c5902c8981f7fdb3..d078df1989b404312c18e44f1c4a39d19dbc0ab3 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -58,7 +58,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 
        phy-handle = <&phy1>;
@@ -66,3 +67,13 @@
 
        qca955x-sgmii-fixup;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index 895398e358a18bf8d2af0b32653f362a8442a11d..d60e7c4857f7ba911b2e5d3cbd507e59430bbfa7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -93,7 +93,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 
        phy-handle = <&phy1>;
@@ -101,3 +102,13 @@
 
        qca955x-sgmii-fixup;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index ba7f014e6a4cfd53fd2f31a0942b2771de505abb..b96b314fa54e23c51bb65436da83eed697a2e896 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -99,7 +99,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy4>;
 
        gmac_config: gmac-config {
@@ -113,6 +114,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-2)>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 0c42208c2034ac824a69138ff5b01ff1199e3714..5b3318b8b280e00d5da851598888c154c017d646 100644 (file)
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -182,7 +182,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        pll-data = <0x56000000 0x00000101 0x00001616>;
        phy-handle = <&phy0>;
 };
@@ -190,7 +191,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
        fixed-link {
                speed = <1000>;
@@ -202,5 +204,24 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0xc>;
+       nvmem-cells = <&macaddr_art_c>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+
+       macaddr_art_c: macaddr@c {
+               reg = <0xc 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index ddb91d07916e23a5fe65934e48b020137b43eb7b..6cd8ba4578beeacd9f831cd9ca53df814b316912 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -167,7 +167,8 @@
        status = "okay";
 
        pll-data = <0xa6000000 0x00000101 0x00001616>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy0>;
 };
@@ -176,7 +177,8 @@
        status = "okay";
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -188,5 +190,24 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0xc>;
+       nvmem-cells = <&macaddr_art_c>;
+       nvmem-cell-names = "mac-address";
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+
+       macaddr_art_c: macaddr@c {
+               reg = <0xc 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
index 2f7cdcf8c3babfefa52972bc9617ea9a31b4df8f..6c5ed4defb2dd05e0b219d1bf011e796df8b58e2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -188,7 +188,8 @@
        status = "okay";
 
        mtd-cal-data = <&caldata 0x1000>;
-       mtd-mac-address = <&caldata 0x06>;
+       nvmem-cells = <&macaddr_caldata_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio0 {
@@ -203,10 +204,25 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&caldata 0x00>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
        phy-mode = "rgmii-rxid";
 
        pll-data = <0x86000000 0x80000101 0x80001313>;
 };
+
+&caldata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_caldata_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_caldata_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index fd54a6e8c21837f3559ce904da3fdc48f343f5e8..66f8c6589b20221edc41a2f882b28229ff8633b9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -124,7 +124,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x06>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio0 {
@@ -140,10 +141,25 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy5>;
        phy-mode = "rgmii-rxid";
 
        pll-data = <0x8e000000 0x80000101 0x80001313>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index 05c2d2d1dca7e5caaba8f886a4103ccc84e2c9e9..2dc4c07e918c50eb522100eb7f72c8804d5ba5fb 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -95,7 +95,8 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x06>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio0 {
@@ -113,7 +114,8 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-rxid";
        phy-handle = <&phy1>;
@@ -132,8 +134,27 @@
 
 &eth1 {
        status = "okay";
-       mtd-mac-address = <&art 0x12>;
+       nvmem-cells = <&macaddr_art_12>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy2>;
        pll-data = <0x3000101 0x101 0x1313>;
        qca955x-sgmii-fixup;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+
+       macaddr_art_12: macaddr@12 {
+               reg = <0x12 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
index 9938e5f4c013575c686edce5699f3541942133d3..05d3a4f34110d953dc30fd66b0856fdf181c4edc 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
@@ -140,7 +140,8 @@
 
        pll-data = <0x82000101 0x80000101 0x80001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
        phy-handle = <&phy1>;
@@ -160,7 +161,8 @@
 
        pll-data = <0x03000101 0x80000101 0x80001313>;
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 
        qca955x-sgmii-fixup;
 
@@ -171,10 +173,25 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
-       mtd-mac-address-increment = <2>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <2>;
 };
 
 &pcie0 {
        status = "okay";
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index fa379030e754ef2be4b39dd17b7c9ec9bd5fe882..8c4856f1ea036c2d5a20c8e6b818f4d35db534f0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -141,7 +141,8 @@
 
        pll-data = <0x82000000 0x80000101 0x80001313>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
        phy-handle = <&phy5>;
@@ -156,10 +157,21 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &pcie0 {
        status = "okay";
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
index 6704fbbe81024e286bed6e5e4b3d16fcd2a264d8..ff33a075f5ef5aa6a951e9d0448ea79e52bb1e6d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
@@ -19,7 +19,18 @@
        wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <16>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
index 7221b5b09885f640d8f9742572328564a845436b..12ebb67ba6aa7025b083e5ff5da8e01fe9943536 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
@@ -19,7 +19,18 @@
        wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
+               nvmem-cells = <&macaddr_art_0>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <16>;
        };
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
index e1c44af3f7af5640bd3ca65dcaa9a36e258c953a..5b28af5ca6efc8a1ef08d896601ad3baf357b8bd 100644 (file)
--- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
+++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
@@ -127,7 +127,8 @@
 
        phy-handle = <&phy0>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -136,7 +137,8 @@
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -165,3 +167,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

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 90332f18746dafb7968952e2b06372be8e244ebf..4f822fbc7d145478b249bcb8a2545622ac717912 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
@@ -70,15 +70,28 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&romfs 0xf100>;
+       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&romfs 0xf100>;
+       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&romfs 0xf100>;
+       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cell-names = "mac-address";
+};
+
+&romfs {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_romfs_f100: macaddr@f100 {
+               reg = <0xf100 0x6>;
+       };
 };

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 754cb17918b722301cade59fa0b81ac76e19e1ee..9adaa7fa6d30372993025c2fd2d6f3b1e6b88ea0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
@@ -64,15 +64,28 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&romfs 0xf100>;
+       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
 &eth1 {
-       mtd-mac-address = <&romfs 0xf100>;
+       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&romfs 0xf100>;
+       nvmem-cells = <&macaddr_romfs_f100>;
+       nvmem-cell-names = "mac-address";
+};
+
+&romfs {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_romfs_f100: macaddr@f100 {
+               reg = <0xf100 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index c0fbeb5a43951b4aea5e9054b9fd09c5b74a8d25..0966f019089ba738836c3f91b86e0215f6a11f93 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -99,7 +99,8 @@
        phy-handle = <&phy4>;
        pll-data = <0x9e000000 0x80000101 0x80001313>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -172,5 +173,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index b12b547a7f75d378eeb96df17b7050af70e55642..31089f339daa4d3ce1096aa78bad53eff723e6a9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -158,13 +158,25 @@
        phy-handle = <&phy4>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
+};

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 10d6e6040b0752a95c8ffafe215c3bf083436e32..5b69a1708eafdcf76136bdad1a5d1f1523dbef34 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,7 +96,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&uboot 0x1fc00>;
+               nvmem-cells = <&macaddr_uboot_1fc00>;
+               nvmem-cell-names = "mac-address";
                mac-address-increment = <(-2)>;
                qca,no-eeprom;
                #gpio-cells = <2>;
@@ -190,7 +191,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
        phy-handle = <&phy0>;
        pll-data = <0x56000000 0x00000101 0x00001616>;
@@ -204,7 +206,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
        fixed-link {
@@ -217,6 +220,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 8f2b626bad2067a4112ab75235b72652ebc9247a..ff7ea7da039ba0a5c601af23c665a33fed7bb0f0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -145,7 +145,8 @@
 
        pll-data = <0x56000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
        phy-handle = <&phy0>;
 };
@@ -155,7 +156,8 @@
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -166,5 +168,16 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index 058acda7469b1ea4f93decdd908c9d75f62b3228..27bf82d20df1965027d1761c9828ef4c3d24111e 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -103,7 +103,8 @@
 &eth0 {
        status = "okay";
        phy-mode = "mii";
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        fixed-link {
                speed = <100>;
                full-duplex;
@@ -113,5 +114,16 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts b/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts
index 3d90531a31a3a1e1e3bf2d96117072cf11a3d0c0..9d3d1395f9bcd7af06b53bf326b39cc4161d46f6 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts
+++ b/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts
@@ -32,7 +32,18 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts b/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts
index e8e2322c568d51f135bfc301b39d31df9c8a0521..0458fcaa4d7a09edc05ae3876ee2b979aa5e0653 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts
+++ b/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts
@@ -32,7 +32,18 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

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 66a578305d640a81561f002ec985d9667da75e08..4b371e0e8e8893a9f22964b7afc5203386b6d9c2 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -172,13 +172,15 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -186,5 +188,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

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 a39fde01e542d03b376ce79656fd3417891b96e2..ecb427029db0272d39b1a1826554d433e78d8222 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
@@ -129,12 +129,24 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

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 6693a5cd737546cc14f8eb2262c3ced055baeccc..6e45fbb20fc8dd2f49de7ca745413135fe1b7ab2 100644 (file)
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -120,19 +120,36 @@
        status = "okay";
 
        phy-handle = <&swphy4>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_art_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
index 1eeb02f7f97f445567fab793c03441410cf9f555..1337341b0b2f475b3852ae1b93af134c548f77ec 100644 (file)
--- a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
+++ b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
@@ -124,7 +124,8 @@
        pll-data = <0x03000101 0x00000101 0x00001919>;
 
        phy-mode = "sgmii";
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
 };
 
@@ -132,6 +133,17 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x0>;
-       mtd-mac-address-increment = <10>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <10>;
+};
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_compex_wpj563.dts b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
index aa829413dcf1dbf1a56f80ad62f716e93de0551e..ba31f40fe283835e5eeff049b643a21be0428eca 100644 (file)
--- a/target/linux/ath79/dts/qca9563_compex_wpj563.dts
+++ b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
@@ -118,7 +118,8 @@
 
        pll-data = <0x03000101 0x00000101 0x00001919>;
 
-       mtd-mac-address = <&uboot 0x2e010>;
+       nvmem-cells = <&macaddr_uboot_2e010>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 };
@@ -136,3 +137,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_2e010: macaddr@2e010 {
+               reg = <0x2e010 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index 9226d37a4326694c37c756159cb0b93d0828c933..878a740cfd077bbbabdc8d17e2109cc6364200ec 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -123,7 +123,8 @@
        status = "okay";
 
        phy-handle = <&phy0>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &gpio {
@@ -175,3 +176,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 8c6a37413182813b39433b6358904e051f16ed09..6090fdf5277ebf71610cfb0ee1fc7a05f86f5194 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -201,7 +201,8 @@
 
        pll-data = <0x03000101 0x00000101 0x00001919>;
 
-       mtd-mac-address = <&caldata 0x0>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
@@ -210,7 +211,8 @@
 &wmac {
        status = "okay";
 
-       mtd-mac-address = <&caldata 0x0>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
        qca,no-eeprom;
 };
 
@@ -221,7 +223,8 @@
                /* chip is AR9580, override bogus PCI ID 168c:abcd */
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&caldata 0xc>;
+               nvmem-cells = <&macaddr_caldata_c>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                qca,gpio-mask=<0xf6ff>; /* unmask pin 9 for RFKILL button */
                #gpio-cells = <2>;
@@ -243,3 +246,17 @@
                #trigger-source-cells = <0>;
        };
 };
+
+&caldata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_caldata_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_caldata_c: macaddr@c {
+               reg = <0xc 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
index 9cf146c918b2f9061400e76f07985facea778a23..91c73567d882aa5a2528f0d7506fd3075e9eb7a3 100644 (file)
--- a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
+++ b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
@@ -118,7 +118,8 @@
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400>;
+       nvmem-cell-names = "mac-address";
 };
 
 &usb_phy0 {
@@ -149,3 +150,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&pridata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_pridata_400: macaddr@400 {
+               reg = <0x400 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index a88eeb3de0d6c9e3eba4177416d0148c91fe4365..c08291560bfde4b59efd6b4372b8c4768e89f66a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -107,7 +107,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&info 0x0>;
+       nvmem-cells = <&macaddr_info_0>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 };
@@ -147,3 +148,13 @@
                #trigger-source-cells = <0>;
        };
 };
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
index 6c4b04b81ce8af6bd5c521146aadedd2dc444010..81c25fc01d4abdb71177c0f1fa678563d55f14fa 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
@@ -161,7 +161,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 };
@@ -170,5 +171,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 63040acf4ae22fe26c35783896c565b4ef99c985..4334475ff76e904aacf09e9a3e5b3a141ff36006 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -247,7 +247,8 @@
        pll-data = <0x03000101 0x00000101 0x00001919>;
 
        phy-mode = "sgmii";
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
 };
 
@@ -255,5 +256,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
index 6b438ce126aff9020f727c6a0ff85e076dd80b5b..ee9f5ff5c7f8341027ffc621ccc8f5a1f125ab63 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
@@ -146,12 +146,24 @@
        phy-handle = <&phy0>;
        phy-mode = "sgmii";
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
index a6aefc7b55a8e8705f833d06290d78a3f1937516..e10c5dbb739373faffef4d64fa28964a3b780b75 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
@@ -114,7 +114,8 @@
        phy-mode = "sgmii";
        pll-data = <0x03000000 0x00000101 0x00001313>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 
        qca956x-serdes-fixup;
 
@@ -127,5 +128,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
index 4df03efb4484d445ea9577548c93b264e64ae68a..d0fa6d332fd10ae1e912825ae2a3f4fa3877901b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
@@ -38,9 +38,21 @@
 };
 
 &eth0 {
-       mtd-mac-address = <&uboot 0x0fc00>;
+       nvmem-cells = <&macaddr_uboot_fc00>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
-       mtd-mac-address = <&uboot 0x0fc00>;
+       nvmem-cells = <&macaddr_uboot_fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_fc00: macaddr@fc00 {
+               reg = <0xfc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
index b41e90abe81eb6bfbe17eaf35c1d3819e4f3cfd4..d2797086f48a271c3e52b93afeb5aa46445aee9a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
@@ -21,9 +21,20 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 
        pll-data = <0x03000000 0x00000101 0x00001313>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
index 5a0cf4badee746f8939ddbae2fa1d833081a7106..f3dc0686053f3208e53062d2a6e9891992ae85a3 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
@@ -25,6 +25,17 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts b/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
index d8fc589d589334f3dfb1f18534c8cb9466143b6d..a7a73ad2fbf488e5751b3c085a5571d2b000ff6a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
+++ b/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
@@ -163,7 +163,8 @@
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -175,3 +176,13 @@
 &pcie {
        status = "okay";
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
index 4eed20bea47a06c8e232a47c775a8ed539a90d9d..f8dec2bc6b78055f027fd94062310e7f6cbe52c3 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -26,7 +26,8 @@
 
        pll-data = <0x03000101 0x00000101 0x00001919>;
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 };
@@ -105,3 +106,13 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
+
+&art {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_art_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
index c1c553e8c822b27b1152a3c4962b4cfc975db52d..416623fec430b6bf5fe957fc02c0ca4c1c79502e 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
@@ -63,6 +63,17 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
+};

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
index 21a2be993cdc970e7432f5f56f9d3d6c57801fd4..35facbdade39f473c84c62d3b45373afa9c60c9e 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
@@ -66,5 +66,16 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
index 4334b70ce87d25c2d19386649d0769b14bfb5ad3..1bc3b0ae90420bfe0d468c2a4198d7225e5ed5b7 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
@@ -30,5 +30,16 @@
 };
 
 &eth1 {
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
index 7451f00740bebcd507a610dacd7275e2be0a925f..d4638f1acf40077d9960ecea396fffcc58346c60 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
@@ -136,19 +136,32 @@
 
        phy-handle = <&swphy0>;
 
-       mtd-mac-address = <&config 0x8>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_config_8>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&config 0x8>;
+       nvmem-cells = <&macaddr_config_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&config 0x8>;
+       nvmem-cells = <&macaddr_config_8>;
+       nvmem-cell-names = "mac-address";
+};
+
+&config {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_config_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
index 14e10596b58bdabfa1c3fd40a2f63ed41e70fb87..3a38b8025abdd9f8c7728b21f65e46e0d5556f1a 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
@@ -50,7 +50,8 @@
 
        phy-handle = <&swphy4>;
 
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -62,5 +63,16 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
+};
+
+&uboot {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_uboot_1fc00: macaddr@1fc00 {
+               reg = <0x1fc00 0x6>;
+       };
 };