From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 2 Apr 2019 15:01:13 +0000 (+0200)
Subject: ath79: Consolidate LEDs in Archer A7/C7 v5 DTSI
X-Git-Tag: v19.07.0-rc1~816
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9888f1b96c174899e89a63342cf28d6a850bf450;p=oweals%2Fopenwrt.git

ath79: Consolidate LEDs in Archer A7/C7 v5 DTSI

Definition is split here without obvious reason. Just merge it
(and align order to that from C7 v4).

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

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
index afb33d6471..766922b6c8 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -24,17 +24,58 @@
 			default-state = "on";
 		};
 
+		usb {
+			label = "tp-link:green:usb";
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&hub_port0>;
+			linux,default-trigger = "usbport";
+		};
+
+		wlan5g {
+			label = "tp-link:green:wlan5g";
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+
 		led_wlan2g: wlan2g {
 			label = "tp-link:green:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
-		usb {
-			label = "tp-link:green:usb";
-			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&hub_port0>;
-			linux,default-trigger = "usbport";
+		wan {
+			label = "tp-link:green:wan";
+			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
+		};
+
+		wan_fail {
+			label = "tp-link:orange:wan";
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
+		};
+
+		lan1 {
+			label = "tp-link:green:lan1";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		lan2 {
+			label = "tp-link:green:lan2";
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+		};
+
+		lan3 {
+			label = "tp-link:green:lan3";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+		};
+
+		lan4 {
+			label = "tp-link:green:lan4";
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+		};
+
+		wps {
+			label = "tp-link:green:wps";
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -94,49 +135,6 @@
 	};
 };
 
-&gpio_leds {
-	wlan5g {
-		label = "tp-link:green:wlan5g";
-		gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-		linux,default-trigger = "phy0tpt";
-	};
-
-	wan {
-		label = "tp-link:green:wan";
-		gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-	};
-
-	wan_fail {
-		label = "tp-link:orange:wan";
-		gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-	};
-
-	lan1 {
-		label = "tp-link:green:lan1";
-		gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-	};
-
-	lan2 {
-		label = "tp-link:green:lan2";
-		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-	};
-
-	lan3 {
-		label = "tp-link:green:lan3";
-		gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-	};
-
-	lan4 {
-		label = "tp-link:green:lan4";
-		gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-	};
-
-	wps {
-		label = "tp-link:green:wps";
-		gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-	};
-};
-
 &spi {
 	status = "okay";
 	num-cs = <1>;