ath79: enable UART in SoC DTSI files

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar7240_netgear_wnr1000-v2.dts

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index 5660ea5cafcf11ac53aa36f3c15a2d94ecb30bf7..7e1c87addec5a23cb9d41d093c377b22bf16d4ab 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -1,10 +1,10 @@
 // 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/mtd/partitions/uimage.h>
 
 / {
        compatible = "netgear,wnr1000-v2", "qca,ar7240";
@@ -15,10 +15,10 @@
        };
 
        aliases {
-               led-boot = &power_amber;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
                label-mac-device = &eth1;
        };
 
@@ -54,64 +54,64 @@
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
-               power_green: power_green {
-                       label = "netgear:green:power";
+               led_power_green: power_green {
+                       label = "green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
-                       label = "netgear:amber:power";
+               led_power_amber: power_amber {
+                       label = "amber:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wan_green {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "netgear:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 0 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 6 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 7 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>;
                };
        };
@@ -120,12 +120,12 @@
                compatible = "gpio-leds";
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
                };
 
                wlan_blue {
-                       label = "netgear:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -134,7 +134,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -160,7 +159,9 @@
                        partition@50000 {
                                label = "firmware";
                                reg = <0x50000 0x3a0000>;
-                               compatible = "netgear,uimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <0x31303031>;
+                               openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
                        };
 
                        art: partition@3f0000 {
@@ -173,8 +174,6 @@
 };
 
 &eth0 {
-       status = "okay";
-
        mtd-mac-address = <&art 0x0>;
 };
 
@@ -197,7 +196,3 @@
                gpio-controller;
        };
 };
-
-&uart {
-       status = "okay";
-};