ath79: ar: convert to mac-base

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar7161_netgear_wndap360.dts

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
index 37a475d3ac7498491c9dedc17bb932f3c44b57c5..9761234714c87b19c0208deb4588d84ce077218b 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
@@ -16,13 +16,6 @@
                led-upgrade = &led_power_orange;
        };
 
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-output-names = "ref";
-               clock-frequency = <40000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -114,10 +107,38 @@
                                read-only;
                        };
 
-                       art: partition@7f0000 {
+                       partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               reg = <0x120c 0x6>;
+                                       };
+
+                                       macaddr_art_520c: macaddr@520c {
+                                               compatible = "mac-base";
+                                               reg = <0x520c 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0xeb8>;
+                                       };
+                               };
                        };
                };
        };
@@ -129,9 +150,8 @@
        ath9k0: wifi@0,11 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
-               qca,no-eeprom;
-               nvmem-cells = <&macaddr_art_120c>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&macaddr_art_120c>, <&calibration_art_1000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -139,30 +159,9 @@
        ath9k1: wifi@0,12 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
-               qca,no-eeprom;
-               nvmem-cells = <&macaddr_art_520c>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
+               nvmem-cells = <&macaddr_art_520c 1>, <&calibration_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #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_120c: macaddr@120c {
-               reg = <0x120c 0x6>;
-       };
-
-       macaddr_art_520c: macaddr@520c {
-               reg = <0x520c 0x6>;
-       };
-};