From 20ec6af15eba161970d95fecbd831e72eb47a56b Mon Sep 17 00:00:00 2001 From: Russell Senior Date: Mon, 26 Nov 2018 14:27:06 -0800 Subject: [PATCH] ath79: split ubnt outdoor device leds into separate dtsi Move common LED configuration into a separate includible dtsi. Signed-off-by: Russell Senior --- .../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 33790f2e1c0..9298ef1c7d8 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 417e5031274..bf6b868ef40 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 4053147c9c1..8931d926cd3 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 f6cefdabd09..6a5e07caf7a 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 00000000000..c773f1aac3c --- /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 +#include + +#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.30.2