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 33c75f49675eb4ea4b598afa7c6c3bc7d6fa3734..8db1bf5e0c0ded71144685f10de720a0a0966376 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
@@ -29,6 +29,9 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
+       nvmem-cells = <&macaddr_lan 0>;
+       nvmem-cell-names = "mac-address";
+
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
@@ -55,7 +58,13 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
+               /* "mac-address" currently does not work for
+                  ath9k pci devices. these below are retained for future
+                  improvements. */
+               /* 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>;
        };
@@ -102,16 +111,48 @@
                                read-only;
                        };
 
-                       partition@fe0000 {
+                       mac: partition@fe0000 {
                                label = "mac";
                                reg = <0xfe0000 0x010000>;
                                read-only;
+
+                               compatible = "nvmem-cells";
+
+                               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>;
+                                       };
+                               };
                        };
 
-                       partition@ff0000 {
+                       art: partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               compatible = "nvmem-cells";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_art_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_art_5000: cal@5000 {
+                                       reg = <0x5000 0x440>;
+                               };
                        };
                };
        };
@@ -127,5 +168,6 @@
 
 &wmac {
        status = "okay";
-       qca,no-eeprom;
+       nvmem-cells = <&macaddr_lan 0>, <&cal_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
 };