ath79: drop and consolidate redundant chosen/bootargs

[oweals/openwrt.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 5a896d52bcc248f39e3f965e26384f658b02b997..ade9159fcf8a2131c84d3b9098fb0ccdf0d95399 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -4,16 +4,12 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9557.dtsi"
+#include "qca955x.dtsi"
 
 / {
        compatible = "zyxel,nbg6716", "qca,qca9558";
        model = "ZyXEL NBG6716";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;
@@ -29,7 +25,7 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               wan {
+               internet {
                        label = "nbg6716:white:internet";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
@@ -38,31 +34,31 @@
                        label = "nbg6716: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";
                        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 = "nbg6716:white:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
-               wifi5 {
-                       label = "nbg6716:white:wifi5";
+               wifi5g {
+                       label = "nbg6716:white:wifi5g";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
                        label = "nbg6716:white:wps";
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -79,18 +75,21 @@
                wifi {
                        label = "WiFi button";
                        linux,code = <KEY_RFKILL>;
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+                       linux,input-type = <EV_SW>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                        debounce-interval = <60>;
                };
 
                usb1 {
                        label = "USB1 eject button";
+                       linux,code = <BTN_1>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
                usb2 {
                        label = "USB2 eject button";
+                       linux,code = <BTN_2>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
@@ -200,8 +199,8 @@
 &mdio0 {
        status = "okay";
 
-       phy0: ethernet-phy@0 {
-               reg = <17>;
+       phy17: ethernet-phy@11 {
+               reg = <0x11>;
                phy-mode = "rgmii-id";
        };
 
@@ -236,7 +235,8 @@
        status = "okay";
 
        pll-data = <0xa6000000 0x00000101 0x00001616>;
-       phy-handle = <&phy0>;
+       phy-handle = <&phy17>;
+
        fixed-link {
                speed = <1000>;
                full-duplex;
@@ -248,6 +248,7 @@
 
        pll-data = <0x03000101 0x00000101 0x00001616>;
        phy-handle = <&phy1>;
+
        fixed-link {
                speed = <1000>;
                full-duplex;
@@ -260,6 +261,8 @@
 
 &wmac {
        status = "okay";
+
+       mtd-cal-data = <&art 0x1000>;
 };
 
 &pcie1 {