ath79: update WA/XC devices UBNT_VERSION to 8.7.4

[openwrt/staging/wigyori.git] / target / linux / ath79 / dts / qca9531_comfast_cf-e560ac.dts

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 75e30ff1b7bb03c60175c2e35095a7f48505b922..535676aab2128661e70a8d203c498a3a540852bd 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "comfast,cf-e560ac", "qca,qca9531";
@@ -60,12 +61,14 @@
                };
 
                wan {
-                       label = "blue:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "blue:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -103,6 +106,22 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
+                                               reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       precal_art_5000: pre-calibration@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -128,6 +147,13 @@
 
 &pcie0 {
        status = "okay";
+
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&precal_art_5000>, <&macaddr_art_0 2>;
+               nvmem-cell-names = "pre-calibration", "mac-address";
+       };
 };
 
 &usb_phy {
@@ -143,13 +169,12 @@
 
        phy-handle = <&swphy4>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth1 {
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -157,17 +182,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 10>;
        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>;
-       };
 };