From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Thu, 12 Dec 2019 18:49:55 +0000 (+0100)
Subject: ramips: DTS style improvements for mt7621_wevo_w2914ns-v2.dtsi
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=5cda133d99f25ac85fcc4ef9ae092f9c4fb90739;p=openwrt%2Fstaging%2Flynxis.git

ramips: DTS style improvements for mt7621_wevo_w2914ns-v2.dtsi

This does several trivial DTS style improvements:

- Move device name compatible to DTS files (and fix compatible in
  11acnas.dts)
- Remove xhci node as status is set to okay in mt7621.dtsi already
- 0x0 instead of 0x0000
- Simplify state_default node definition

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts
index ec31542632..0320a45060 100644
--- a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts
+++ b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts
@@ -3,7 +3,7 @@
 #include "mt7621_wevo_w2914ns-v2.dtsi"
 
 / {
-	compatible = "wevo,11acnas", "wevo,w2914ns-v2", "mediatek,mt7621-soc";
+	compatible = "wevo,11acnas", "mediatek,mt7621-soc";
 	model = "WeVO 11AC NAS Router";
 
 	leds {
diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts
index 816f6b1c0f..bb9fa59484 100644
--- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts
+++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts
@@ -3,6 +3,7 @@
 #include "mt7621_wevo_w2914ns-v2.dtsi"
 
 / {
+	compatible = "wevo,w2914ns-v2", "mediatek,mt7621-soc";
 	model = "WeVO W2914NS v2";
 
 	leds {
diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
index 6ad3ef111f..2cffb9520c 100644
--- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
+++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
@@ -4,8 +4,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "wevo,w2914ns-v2", "mediatek,mt7621-soc";
-
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
@@ -27,10 +25,6 @@
 	};
 };
 
-&xhci {
-	status = "okay";
-};
-
 &spi0 {
 	status = "okay";
 
@@ -80,7 +74,7 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		mediatek,mtd-eeprom = <&factory 0x0>;
 
 		led {
 			led-sources = <0>;
@@ -107,11 +101,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2";
+		ralink,function = "gpio";
 	};
 };