ath79: update WA/XC devices UBNT_VERSION to 8.7.4

[openwrt/staging/wigyori.git] / target / linux / ath79 / dts / ar9344_comfast_cf-e120a-v3.dts

diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
index b0fdce77a61786b8d77949190de6aa0d5476896c..6bfa82356bfce92c55af3b614ff66c1148071d3a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
+++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar9344.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "ar9344.dtsi"
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "comfast,cf-e120a-v3", "qca,ar9344";
        model = "COMFAST CF-E120A v3";
 
        aliases {
-               serial0 = &uart;
-               led-boot = &wan;
-               led-failsafe = &wan;
-               led-upgrade = &wan;
+               led-boot = &led_rssihigh;
+               led-failsafe = &led_rssihigh;
+               led-upgrade = &led_rssihigh;
+               label-mac-device = &eth0;
        };
 
        leds {
@@ -23,46 +23,48 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_rssimediumhigh_pin>;
 
-               wan: wan {
-                       label = "cf-e120a-v3:green:wan";
+               wan {
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e120a-v3:green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e120a-v3:green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                rssilow {
-                       label = "cf-e120a-v3:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e120a-v3:red:rssimediumlow";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e120a-v3:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
-               rssihigh {
-                       label = "cf-e120a-v3:green:rssihigh";
+               led_rssihigh: rssihigh {
+                       label = "green:rssihigh";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
@@ -74,14 +76,13 @@
 };
 
 &pinmux {
-               led_rssimediumhigh_pin: pinmux_rssimediumhigh_pin {
-                       pinctrl-single,bits = <0x10 0x0 0xff>;
-               };
+       led_rssimediumhigh_pin: pinmux_rssimediumhigh_pin {
+               pinctrl-single,bits = <0x10 0x0 0xff>;
+       };
 };
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -93,7 +94,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       uboot:  partition@0 {
+                       partition@0 {
                                label = "u-boot";
                                reg = <0x000000 0x010000>;
                                read-only;
@@ -103,15 +104,29 @@
                                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>;
+                                       };
+                               };
                        };
 
-                       firmware: partition@20000 {
+                       partition@20000 {
                                compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       nvram: partition@7f0000 {
+                       partition@7f0000 {
                                label = "nvram";
                                reg = <0x7f0000 0x010000>;
                                read-only;
@@ -120,14 +135,11 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &eth0 {
        status = "okay";
        phy-handle = <&swphy0>;
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
 
        gmac-config {
                device = <&gmac>;
@@ -137,7 +149,8 @@
 
 &eth1 {
        status = "okay";
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {