ath79: update WA/XC devices UBNT_VERSION to 8.7.4

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

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index d81d9c54f59caf9cc9a2a6578c5c02921eba8709..76ae8a99a691b5a21fc589f9d2ae2d30788df674 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -1,19 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
-#include "qca9557.dtsi"
+#include "qca955x_zyxel_nbg6x16.dtsi"
 
 / {
        compatible = "zyxel,nbg6716", "qca,qca9558";
        model = "ZyXEL NBG6716";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;
@@ -25,103 +19,73 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "nbg6716:white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               wan {
-                       label = "nbg6716:white:internet";
+               internet {
+                       label = "white:internet";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                usb1 {
-                       label = "nbg6716:white:usb1";
+                       label = "white:usb1";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
-                       trigger-sources = <&hub_port0>;
+                       trigger-sources = <&hub_port1>;
                };
 
                usb2 {
-                       label = "nbg6716:white:usb2";
+                       label = "white:usb2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
-                       trigger-sources = <&hub_port1>;
+                       trigger-sources = <&hub_port0>;
                };
 
-               wifi2 {
-                       label = "nbg6716:white:wifi2";
+               wifi2g {
+                       label = "white:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
-               wifi5 {
-                       label = "nbg6716:white:wifi5";
+               wifi5g {
+                       label = "white:wifi5g";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "nbg6716:white:wps";
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
+                       gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
        };
+};
 
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               wifi_button {
-                       label = "WiFi button";
-                       linux,code = <KEY_RFKILL>;
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               usb1 {
-                       label = "USB1 eject button";
-                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               usb2 {
-                       label = "USB2 eject button";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               wps {
-                       label = "WPS button";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
+&keys {
+       usb1 {
+               label = "USB1 eject button";
+               linux,code = <BTN_1>;
+               gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+               debounce-interval = <60>;
        };
-};
 
-&gpio {
-       usb_power {
-               gpio-hog;
-               gpios = <16 0>;
-               output-high;
-               line-name = "nbg6716:power:usb";
+       usb2 {
+               label = "USB2 eject button";
+               linux,code = <BTN_2>;
+               gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+               debounce-interval = <60>;
        };
 };
 
-&uart {
-       status = "okay";
+&gpio_usb_power {
+       line-name = "nbg6716:power:usb";
 };
 
 &spi {
        status = "okay";
 
-       num-cs = <1>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
@@ -147,6 +111,16 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -183,118 +157,32 @@
                firmware@500000 {
                        label = "firmware";
                        reg = <0x500000 0x7b00000>;
-               };
-
-               partition@500000 {
-                       label = "kernel";
-                       reg = <0x500000 0x400000>;
-               };
-
-               partition@900000 {
-                       label = "ubi";
-                       reg = <0x900000 0x7700000>;
-               };
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy0: ethernet-phy@0 {
-               reg = <17>;
-               phy-mode = "rgmii-id";
-       };
 
-       switch0@1f {
-               compatible = "qca,ar8327";
-               reg = <0x1f>;
-               qca,ar8327-initvals = <
-                       0x04 0x87600000 /* PORT0 PAD MODE CTRL */
-                       0x0c 0x00080080 /* PORT6 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
-                       0x50 0xffb7ffb7 /* LED_CTRL0 */
-                       0x54 0xffb7ffb7 /* LED_CTRL1 */
-                       0x58 0xffb7ffb7 /* LED_CTRL2 */
-                       0x5c 0x03ffff00 /* LED_CTRL3 */
-                       0x7c 0x0000007e /* PORT0_STATUS */
-                       0x94 0x0000007e /* PORT6 STATUS */
-                       >;
-       };
-};
-
-&mdio1 {
-       status = "okay";
-
-       phy1: ethernet-phy@1 {
-               reg = <1>;
-               phy-mode = "sgmii";
-       };
-};
-
-
-&eth0 {
-       status = "okay";
-
-       pll-data = <0xa6000000 0x00000101 0x00001616>;
-       phy-handle = <&phy0>;
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-};
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-&eth1 {
-       status = "okay";
+                       partition@0 {
+                               label = "kernel";
+                               reg = <0x0 0x400000>;
+                       };
 
-       pll-data = <0x03000101 0x00000101 0x00001616>;
-       phy-handle = <&phy1>;
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
+                       partition@400000 {
+                               label = "ubi";
+                               reg = <0x400000 0x7700000>;
+                       };
+               };
        };
 };
 
-&gpio {
-       status = "okay";
-};
-
-&wmac {
-       status = "okay";
-};
-
 &pcie1 {
        status = "okay";
 
        wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
+               nvmem-cells = <&cal_art_5000>;
+               nvmem-cell-names = "calibration";
                qcom,ath10k-calibration-variant = "ZyXEL-NBG6716";
        };
 };
-
-&usb_phy0 {
-       status = "okay";
-};
-
-&usb_phy1 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
-
-};
-
-&usb1 {
-       status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
-};