ath79: split ubnt outdoor device leds into separate dtsi

Move common LED configuration into a separate includible dtsi.

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

diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
index 33790f2e1c0ec2af25176de59359440d00ea46a5..9298ef1c7d8e603aa24d090446e92b3aa0d30a07 100644 (file)
--- 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/;
 
 // 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";
 
 / {
        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 417e50312747ae6d8220b08b4b8cfc76261f3cbe..bf6b868ef4073d3bf1a265f750a0f7adbeda4483 100644 (file)
--- 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/;
 
 // 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";
 
 / {
        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 4053147c9c143f93f60449b0c0951835476be5de..8931d926cd3f82813b53a85e881e260fa9c7e3aa 100644 (file)
--- 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/;
 
 // 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";
 
 / {
        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 f6cefdabd090197d52057b5697ec7d1d7f3fc8dd..6a5e07caf7abec00869e254d8988ee00b332cacd 100644 (file)
--- 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";
 
        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>;
 /*     extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;


@@ -29,29 +24,6 @@
                        debounce-interval = <60>;
                };
        };
                        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 {
 };
 
 &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 (file)
index 0000000..c773f1a
--- /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>;
+               };
+       };
+};