[openwrt/openwrt] bmips: dts: align LEDs

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 29 17:24:38 BST 2021


noltari pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/bb2d6ffe61546d6760e5c56ba02f3f2eb8114013

commit bb2d6ffe61546d6760e5c56ba02f3f2eb8114013
Author: Álvaro Fernández Rojas <noltari at gmail.com>
AuthorDate: Wed Mar 24 11:30:23 2021 +0100

    bmips: dts: align LEDs
    
    Align all bmips devices LED configurations.
    
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 .../linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts  |  6 ++++--
 .../linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts   | 14 +++++++++-----
 .../linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts  | 11 +++++++----
 target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts  | 21 ++++++++++-----------
 .../linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts | 18 ++++++++++--------
 .../linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts   |  7 +++++--
 6 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
index e2c05f9e6f..094dca1585 100644
--- a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
@@ -12,6 +12,8 @@
 		led-running = &led_power_green;
 		led-upgrade = &led_power_green;
 
+		led-dsl = &led_dsl_green;
+		led-internet = &led_internet_green;
 		led-usb = &led_usb_green;
 	};
 
@@ -75,7 +77,7 @@
 		label = "red:internet";
 	};
 
-	led at 3 {
+	led_dsl_green: led at 3 {
 		reg = <3>;
 		active-low;
 		label = "green:dsl";
@@ -93,7 +95,7 @@
 		label = "green:wps";
 	};
 
-	led at 8 {
+	led_internet_green: led at 8 {
 		reg = <8>;
 		active-low;
 		label = "green:internet";
diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
index 725c7e38cd..0a53ece140 100644
--- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
@@ -8,9 +8,13 @@
 
 	aliases {
 		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
+		led-failsafe = &led_power_red;
 		led-running = &led_power_green;
 		led-upgrade = &led_power_green;
+
+		led-dsl = &led_dsl_green;
+		led-internet = &led_internet_green;
+		led-usb = &led_usb_green;
 	};
 
 	keys {
@@ -123,7 +127,7 @@
 		label = "green:power";
 	};
 
-	led at 2 {
+	led_usb_green: led at 2 {
 		reg = <2>;
 		active-low;
 		label = "green:usb";
@@ -157,7 +161,7 @@
 		/* EPHY3 Act */
 	};
 
-	led at 8 {
+	led_internet_green: led at 8 {
 		reg = <8>;
 		active-low;
 		label = "green:internet";
@@ -169,13 +173,13 @@
 		label = "red:internet";
 	};
 
-	led at 10 {
+	led_dsl_green: led at 10 {
 		reg = <10>;
 		active-low;
 		label = "green:dsl";
 	};
 
-	led at 11 {
+	led_power_red: led at 11 {
 		reg = <11>;
 		active-low;
 		label = "red:power";
diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index c10c3ae2fc..06fe1f9009 100644
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -8,9 +8,12 @@
 
 	aliases {
 		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
+		led-failsafe = &led_power_red;
 		led-running = &led_power_green;
 		led-upgrade = &led_power_green;
+
+		led-dsl = &led_dsl_green;
+		led-internet = &led_internet_green;
 	};
 
 	keys {
@@ -120,12 +123,12 @@
 		label = "red:internet";
 	};
 
-	led at 4 {
+	led_power_red: led at 4 {
 		reg = <4>;
 		label = "red:power";
 	};
 
-	led at 7 {
+	led_internet_green: led at 7 {
 		reg = <7>;
 		label = "green:internet";
 	};
@@ -135,7 +138,7 @@
 		label = "green:power";
 	};
 
-	led at 11 {
+	led_dsl_green: led at 11 {
 		reg = <11>;
 		active-low;
 		label = "green:dsl";
diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
index 9658e2abca..1ec5a71515 100644
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
@@ -7,14 +7,13 @@
 	model = "Huawei EchoLife HG556a (version B)";
 
 	aliases {
-		led-boot = &power_red;
-		led-failsafe = &power_red;
-		led-running = &power_red;
-		led-upgrade = &power_red;
-
-		led-dsl = &dsl_red;
-		led-internet = &dsl_red;
-		led-usb = &hspa_red;
+		led-boot = &led_power_red;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_red;
+		led-upgrade = &led_power_red;
+
+		led-dsl = &led_dsl_red;
+		led-usb = &led_hspa_red;
 	};
 
 	keys {
@@ -58,17 +57,17 @@
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
-		hspa_red: led at 1 {
+		led_hspa_red: led at 1 {
 			label = "red:hspa";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
-		dsl_red: led at 2 {
+		led_dsl_red: led at 2 {
 			label = "red:dsl";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
-		power_red: led at 3 {
+		led_power_red: led at 3 {
 			label = "red:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
diff --git a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
index e4c7c7b3cc..9e5b1610dc 100644
--- a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -8,11 +8,13 @@
 
 	aliases {
 		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
+		led-failsafe = &led_power_red;
 		led-running = &led_power_green;
 		led-upgrade = &led_power_green;
 
+		led-dsl = &led_dsl_green;
 		led-ethernet = &led_ethernet_green;
+		led-internet = &led_internet_green;
 		led-usb = &led_usb1_green;
 		led-usb2 = &led_usb2_green;
 	};
@@ -46,12 +48,12 @@
 	leds {
 		compatible = "gpio-leds";
 
-		led at 28 {
+		led_dsl_green: led at 28 {
 			label = "green:dsl";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 
-		led at 34 {
+		led_power_red: led at 34 {
 			label = "red:power";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
@@ -79,7 +81,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led>;
 
-	led at 1 {
+	led_internet_green: led at 1 {
 		reg = <1>;
 		active-low;
 		label = "green:internet";
@@ -96,13 +98,13 @@
 		label = "green:wps";
 	};
 
-	led at 10 {
+	led_usb1_green: led at 10 {
 		reg = <10>;
 		active-low;
 		label = "green:usb1";
 	};
 
-	led at 11 {
+	led_usb2_green: led at 11 {
 		reg = <11>;
 		active-low;
 		label = "green:usb2";
@@ -126,13 +128,13 @@
 		label = "amber:dsl";
 	};
 
-	led_usb1_green: led at 16 {
+	led at 16 {
 		reg = <16>;
 		active-low;
 		label = "amber:usb1";
 	};
 
-	led_usb2_green: led at 17 {
+	led at 17 {
 		reg = <17>;
 		active-low;
 		label = "amber:usb2";
diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
index 4c00df32b9..b4d2047cd8 100644
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
@@ -11,6 +11,9 @@
 		led-failsafe = &led_power_red;
 		led-running = &led_power_green;
 		led-upgrade = &led_power_green;
+
+		led-dsl = &led_dsl_green;
+		led-internet = &led_internet_green;
 	};
 
 	keys {
@@ -28,12 +31,12 @@
 	leds {
 		compatible = "gpio-leds";
 
-		led at 2 {
+		led_dsl_green: led at 2 {
 			label = "green:dsl";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
-		led at 5 {
+		led_internet_green: led at 5 {
 			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};



More information about the lede-commits mailing list