From: Sungbo Eo <mans0n@gorani.run>
Date: Sun, 1 Aug 2021 15:02:49 +0000 (+0900)
Subject: ramips: w2914ns-v2: consolidate leds nodes into dtsi
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f08b76b32fded7ff3ba0453d45216e19146b7bc5;p=openwrt%2Fstaging%2Fjow.git

ramips: w2914ns-v2: consolidate leds nodes into dtsi

w2914ns-v2, 11acnas, and freezio use almost same board and thus share a
common dtsi file. Now that LED labels do not contain "devicename" since
commit c846dd91f0a6 ("ramips: remove model name from LED labels"), let's
move the leds nodes to dtsi and remove them from dts.

Note that freezio has only one USB 3.0 port and adding &ehci_port2 trigger
does not incur any visible changes.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts
index 60d31852f0..173b1de049 100644
--- a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts
+++ b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts
@@ -3,15 +3,4 @@
 / {
 	compatible = "wevo,11acnas", "mediatek,mt7621-soc";
 	model = "WeVO 11AC NAS Router";
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb {
-			label = "green:usb";
-			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
-			linux,default-trigger = "usbport";
-		};
-	};
 };
diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts
index bd449832e3..b9ed186848 100644
--- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts
+++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts
@@ -3,15 +3,4 @@
 / {
 	compatible = "wevo,w2914ns-v2", "mediatek,mt7621-soc";
 	model = "WeVO W2914NS v2";
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb {
-			label = "green:usb";
-			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
-			linux,default-trigger = "usbport";
-		};
-	};
 };
diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
index 06b301ba0b..005cc619c6 100644
--- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
+++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
@@ -8,6 +8,17 @@
 		label-mac-device = &wan;
 	};
 
+	leds {
+		compatible = "gpio-leds";
+
+		usb {
+			label = "green:usb";
+			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
+		};
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
diff --git a/target/linux/ramips/dts/mt7621_zio_freezio.dts b/target/linux/ramips/dts/mt7621_zio_freezio.dts
index be7e5dcf98..35c4309cba 100644
--- a/target/linux/ramips/dts/mt7621_zio_freezio.dts
+++ b/target/linux/ramips/dts/mt7621_zio_freezio.dts
@@ -5,15 +5,4 @@
 / {
 	compatible = "zio,freezio", "mediatek,mt7621-soc";
 	model = "ZIO FREEZIO";
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb {
-			label = "green:usb";
-			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>;
-			linux,default-trigger = "usbport";
-		};
-	};
 };