ath79: update WA/XC devices UBNT_VERSION to 8.7.4

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

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index fa98f752387446dc004c63c6ce14964f26a10d7b..9a616921e5392fe3a0234d5752e497e4e07d824b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "qca953x.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "qca953x.dtsi"
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "comfast,cf-e314n-v2", "qca,qca9531";
@@ -12,9 +12,9 @@
 
        aliases {
                serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-upgrade = &system;
+               led-boot = &led_rssihigh;
+               led-failsafe = &led_rssihigh;
+               led-upgrade = &led_rssihigh;
        };
 
        leds {
@@ -24,37 +24,40 @@
                pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
                wan {
-                       label = "cf-e314n-v2:green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e314n-v2:green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "cf-e314n-v2:red:signal1";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e314n-v2:red:signal2";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e314n-v2:green:signal3";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+                       label = "green:rssimediumhigh";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               system: rssihigh {
-                       label = "cf-e314n-v2:green:signal4";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+               led_rssihigh: rssihigh {
+                       label = "green:rssihigh";
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e314n-v2:green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -88,7 +91,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -110,6 +112,20 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -133,19 +149,18 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
-       status = "okay";
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {