[PATCH linux dev-4.10 4/5] aspeed: witherspoon: Tidy and unify LED nodes

[Andrew Jeffery]

There's no reason for these to be separate, the gpios property defines
the controller needed for each LED. Also fix the node names so we can
drop the label property.

Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 25 ++++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index dd30c20c9fb2..81996f070818 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -87,48 +87,43 @@
 		};
 	};
 
-	pca_leds {
+	leds {
 		compatible = "gpio-leds";
 
 		fan0 {
-			label = "fan0";
 			default-state = "keep";
 			gpios = <&pca0 0 GPIO_ACTIVE_LOW>;
 		};
+
 		fan1 {
-			label = "fan1";
 			default-state = "keep";
 			gpios = <&pca0 1 GPIO_ACTIVE_LOW>;
 		};
+
 		fan2 {
-			label = "fan2";
 			default-state = "keep";
 			gpios = <&pca0 2 GPIO_ACTIVE_LOW>;
 		};
+
 		fan3 {
-			label = "fan3";
 			default-state = "keep";
 			gpios = <&pca0 3 GPIO_ACTIVE_LOW>;
 		};
-		front_fault {
-			label = "front-fault";
+
+		front-fault {
 			default-state = "keep";
 			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;
 		};
-		front_power {
-			label = "front-power";
+
+		front-power {
 			default-state = "keep";
 			gpios = <&pca0 14 GPIO_ACTIVE_LOW>;
 		};
-		front_id {
-			label = "front-id";
+
+		front-id {
 			default-state = "keep";
 			gpios = <&pca0 15 GPIO_ACTIVE_LOW>;
 		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
 
 		rear-fault {
 			gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>;
-- 
2.11.0