ath79: update WA/XC devices UBNT_VERSION to 8.7.4

[openwrt/staging/wigyori.git] / target / linux / ath79 / dts / ar7240_buffalo_whr-g301n.dts

diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
index 31053e39b100ee61a23634ca93432ca9f147f532..d5ceb8b44ae20b9beaef81c53e0927fd039e4efc 100644 (file)
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -1,24 +1,23 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar7240.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "ar7240.dtsi"
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "buffalo,whr-g301n", "qca,ar7240";
        model = "Buffalo WHR-G301N";
 
        aliases {
-               led-boot = &diag;
-               led-failsafe = &diag;
-               led-upgrade = &diag;
+               led-boot = &led_diag;
+               led-failsafe = &led_diag;
+               led-upgrade = &led_diag;
        };
 
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+       keys {
+               compatible = "gpio-keys";
 
                router_on {
                        label = "router_on";
@@ -51,48 +50,49 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&switch_led_pins>;
 
                security {
-                       label = "whr-g301n:orange:security";
+                       label = "orange:security";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
-               diag: diag {
-                       label = "whr-g301n:red:diag";
+               led_diag: diag {
+                       label = "red:diag";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                router {
-                       label = "whr-g301n:green:router";
+                       label = "green:router";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "whr-g301n:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "whr-g301n:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "whr-g301n:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "whr-g301n:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "whr-g301n:green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -101,7 +101,8 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "whr-g301n:green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -110,7 +111,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -150,22 +150,33 @@
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               compatible = "mac-base";
+                                               reg = <0x120c 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &eth0 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x120c>;
+       nvmem-cells = <&macaddr_art_120c 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x120c>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_art_120c 1>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -175,7 +186,8 @@
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;
-               mtd-mac-address = <&art 0x120c>;
+               nvmem-cells = <&macaddr_art_120c 0>;
+               nvmem-cell-names = "mac-address";
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -186,7 +198,3 @@
                pinctrl-single,bits = <0x0 0x0 0xf8>;
        };
 };
-
-&uart {
-       status = "okay";
-};