[OpenWrt-Devel] [PATCHv3 1/2] ath79: split ubnt outdoor device leds into separate dtsi

[Russell Senior]

Move common LED configuration into a separate includible dtsi.

Signed-off-by: Russell Senior <russell at personaltelco.net>

---
 .../linux/ath79/dts/ar7241_ubnt_bullet-m.dts  |  2 +-
 target/linux/ath79/dts/ar7241_ubnt_nano-m.dts |  2 +-
 .../linux/ath79/dts/ar7241_ubnt_rocket-m.dts  |  2 +-
 target/linux/ath79/dts/ar7241_ubnt_xm.dtsi    | 28 ---------------
 .../ath79/dts/ar7241_ubnt_xm_outdoor.dtsi     | 36 +++++++++++++++++++
 5 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi

diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
index 33790f2e1c..9298ef1c7d 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_ubnt_xm.dtsi"
+#include "ar7241_ubnt_xm_outdoor.dtsi"
 
 / {
 	compatible = "ubnt,bullet-m", "qca,ar7241";
diff --git a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts
index 417e503127..bf6b868ef4 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_ubnt_xm.dtsi"
+#include "ar7241_ubnt_xm_outdoor.dtsi"
 
 / {
 	compatible = "ubnt,nano-m", "qca,ar7241";
diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
index 4053147c9c..8931d926cd 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_ubnt_xm.dtsi"
+#include "ar7241_ubnt_xm_outdoor.dtsi"
 
 / {
 	compatible = "ubnt,rocket-m", "qca,ar7241";
diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index f6cefdabd0..6a5e07caf7 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
@@ -9,11 +9,6 @@
 	compatible = "ubnt,xm", "qca,ar7241";
 	model = "Ubiquiti Networks XM (rev 1.0) board";
 
-	aliases {
-		led-boot = &link4;
-		led-failsafe = &link4;
-	};
-
 /*	extosc: ref {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
@@ -29,29 +24,6 @@
 			debounce-interval = <60>;
 		};
 	};
-
-	leds {
-		compatible = "gpio-leds";
-		link1 {
-			label = "ubnt:red:link1";
-			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-		};
-
-		link2 {
-			label = "ubnt:orange:link2";
-			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-		};
-
-		link3 {
-			label = "ubnt:green:link3";
-			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-		};
-
-		link4: link4 {
-			label = "ubnt:green:link4";
-			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-		};
-	};
 };
 
 &uart {
diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
new file mode 100644
index 0000000000..c773f1aac3
--- /dev/null
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar7241_ubnt_xm.dtsi"
+
+/ {
+	aliases {
+		led-boot = &link4;
+		led-failsafe = &link4;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		link1 {
+			label = "ubnt:red:link1";
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+		};
+
+		link2 {
+			label = "ubnt:orange:link2";
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+		};
+
+		link3 {
+			label = "ubnt:green:link3";
+			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
+		};
+
+		link4: link4 {
+			label = "ubnt:green:link4";
+			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
-- 
2.19.1



-- 
Russell Senior, President
russell at personaltelco.net

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel