ath79: update WA/XC devices UBNT_VERSION to 8.7.4

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

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index b4765d1a1434a9ccaac02a743fa6f9e7e3daa0d1..d8baa071112369ed1a6d27954790fded5c2f87cf 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar7241.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "ar7241.dtsi"
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        compatible = "netgear,wnr2000-v3", "qca,ar7241";
@@ -58,57 +59,60 @@
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
                wan_green {
-                       label = "netgear:green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "netgear:amber:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                lan1_green {
-                       label = "netgear:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan1_amber {
-                       label = "netgear:amber:lan1";
+                       label = "amber:lan1";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                lan2_green {
-                       label = "netgear:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan2_amber {
-                       label = "netgear:amber:lan2";
+                       label = "amber:lan2";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan3_green {
-                       label = "netgear:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan3_amber {
-                       label = "netgear:amber:lan3";
+                       label = "amber:lan3";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan4_green {
-                       label = "netgear:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan4_amber {
-                       label = "netgear:amber:lan4";
+                       label = "amber:lan4";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
        };
@@ -117,18 +121,21 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&ath9k 3 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wlan_blue {
-                       label = "netgear:blue:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -138,8 +145,6 @@
 &spi {
        status = "okay";
 
-       num-cs = <1>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
@@ -164,13 +169,31 @@
                        partition@50000 {
                                label = "firmware";
                                reg = <0x50000 0x3a0000>;
-                               compatible = "netgear,uimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <0x32303033>;
+                               openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
                        };
 
                        art: partition@3f0000 {
                                label = "art";
                                reg = <0x3f0000 0x10000>;
                                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>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -179,13 +202,15 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -194,14 +219,10 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002e";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
-               mtd-mac-address-increment = <1>;
+               nvmem-cells = <&macaddr_art_0 1>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
-
-&uart {
-       status = "okay";
-};