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

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar9344_dlink_dir-8x5.dtsi

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
index 8e21b0dd9e8ff83b2ca9c8b99dfd99a9ad395c23..8db1bf5e0c0ded71144685f10de720a0a0966376 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
@@ -29,8 +29,8 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address-ascii";
+       nvmem-cells = <&macaddr_lan 0>;
+       nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
@@ -58,13 +58,13 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               /* "mac-address-ascii" currently does not work for
+               /* "mac-address" currently does not work for
                   ath9k pci devices. these below are retained for future
                   improvements. */
-               /* nvmem-cells = <&macaddr_wan>, <&cal_art_5000>;
-                  nvmem-cell-names = "mac-address-ascii", "calibration";
-                  mac-address-increment = <1>; */
-               qca,no-eeprom; /* remove this when "mac-address-ascii" works  */
+               /* nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
+                  nvmem-cell-names = "mac-address", "calibration";
+                */
+               qca,no-eeprom; /* remove this when "mac-address" works  */
                gpio-controller;
                #gpio-cells = <2>;
        };
@@ -117,15 +117,23 @@
                                read-only;
 
                                compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_lan: macaddr@4 {
-                                       reg = <0x4 0x11>;
-                               };
 
-                               macaddr_wan: macaddr@18 {
-                                       reg = <0x18 0x11>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_lan: macaddr@4 {
+                                               compatible = "mac-base";
+                                               reg = <0x4 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_wan: macaddr@18 {
+                                               compatible = "mac-base";
+                                               reg = <0x18 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -160,6 +168,6 @@
 
 &wmac {
        status = "okay";
-       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";
 };