ath79: update WA/XC devices UBNT_VERSION to 8.7.4

[openwrt/staging/wigyori.git] / target / linux / ath79 / dts / qca9558_qxwlan_e558.dtsi

diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
index 99f37ac025cf05863182f885a2c19310afd26934..9cbdca234d9bd68d1f1ba13ef91e82316ce77b32 100644 (file)
--- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
+++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -29,7 +30,8 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -62,7 +64,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -90,6 +91,18 @@
                                label = "pri-data";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_pridata_400: macaddr@400 {
+                                               compatible = "mac-base";
+                                               reg = <0x400 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        art: partition@60000 {
@@ -128,8 +141,8 @@
 
        phy-handle = <&phy0>;
 
-       mtd-mac-address = <&pridata 0x400>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_pridata_400 1>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
@@ -137,7 +150,8 @@
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&pridata 0x400>;
+       nvmem-cells = <&macaddr_pridata_400 0>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -145,10 +159,6 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &usb_phy0 {
        status = "okay";
 };