ath79: enable UART in SoC DTSI files

[openwrt/staging/jow.git] / target / linux / ath79 / dts / qca9531_comfast_cf-e5.dts

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index 3851f77f6a300f3d32b7baad3a88af2f374d729c..57727754bba4d4a52f741a3cf155f7faafddc6b6 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "qca953x.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca953x.dtsi"
-
 / {
        compatible = "comfast,cf-e5", "qca,qca9531";
        model = "COMFAST CF-E5/E7";
@@ -15,10 +14,9 @@
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
-               button0 {
+               reset {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
@@ -31,42 +29,38 @@
                pinctrl-0 = <&jtag_disable_pins &led_wan_pin>;
 
                wan {
-                       label = "cf-e5:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e5:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e5:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                rssi0 {
-                       label = "cf-e5:blue:rssi0";
+                       label = "blue:rssi0";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "cf-e5:blue:rssi1";
+                       label = "blue:rssi1";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "cf-e5:blue:rssi2";
+                       label = "blue:rssi2";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &usb0 {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -84,7 +78,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -125,8 +118,10 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&art 0x0>;
+
        phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
@@ -135,6 +130,7 @@
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };