ath79: replace "mac-address-ascii" with "mac-base"

[openwrt/staging/stintel.git] / target / linux / ath79 / dts / ar7161_dlink_dir-825-b1.dts

diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index 0e39be7d0bb97cb3a19daff9e0891197a19241b7..bdb678298d73eedeed4c28ec92a52feeb0ed0e03 100644 (file)
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -139,8 +139,8 @@
        ath9k0: wifi@0,11 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
-               nvmem-cells = <&macaddr_lan>, <&cal_art_1000>;
-               nvmem-cell-names = "mac-address-ascii", "calibration";
+               nvmem-cells = <&macaddr_lan 0>, <&cal_art_1000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -148,9 +148,8 @@
        ath9k1: wifi@0,12 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
-               nvmem-cells = <&macaddr_wan>, <&cal_art_5000>;
-               nvmem-cell-names = "mac-address-ascii", "calibration";
-               mac-address-increment = <1>;
+               nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -191,23 +190,31 @@
                                label = "caldata";
                                reg = <0x660000 0x010000>;
                                read-only;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0xeb8>;
-                               };
-
-                               cal_art_5000: cal@5000 {
-                                       reg = <0x5000 0xeb8>;
-                               };
-
-                               macaddr_lan: macaddr@ffa0 {
-                                       reg = <0xffa0 0x11>;
-                               };
-
-                               macaddr_wan: macaddr@ffb4 {
-                                       reg = <0xffb4 0x11>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
+
+                                       cal_art_5000: cal@5000 {
+                                               reg = <0x5000 0xeb8>;
+                                       };
+
+                                       macaddr_lan: macaddr@ffa0 {
+                                               compatible = "mac-base";
+                                               reg = <0xffa0 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_wan: macaddr@ffb4 {
+                                               compatible = "mac-base";
+                                               reg = <0xffb4 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -224,8 +231,8 @@
 
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address-ascii";
+       nvmem-cells = <&macaddr_lan 0>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -238,8 +245,8 @@
 
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
-       nvmem-cells = <&macaddr_wan>;
-       nvmem-cell-names = "mac-address-ascii";
+       nvmem-cells = <&macaddr_wan 0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
 };