From ab402f3d23223b23f622a69e1afa570cfef16099 Mon Sep 17 00:00:00 2001 From: Jo Deisenhofer Date: Fri, 2 Dec 2022 16:39:02 +0100 Subject: [PATCH] ramips: Move LED definition out of included dtsi into dts Prepare for a new target with different led definitions that wants to include this dtsi. The resulting dtb are unchanged, verified with dtdiff Signed-off-by: Jo Deisenhofer --- .../dts/mt7628an_xiaomi_mi-router-4.dtsi | 27 ------------------ ...mt7628an_xiaomi_mi-router-4a-100m-intl.dts | 28 +++++++++++++++++++ .../dts/mt7628an_xiaomi_mi-router-4a-100m.dts | 28 +++++++++++++++++++ .../dts/mt7628an_xiaomi_mi-router-4c.dts | 25 +++++++++++++++++ 4 files changed, 81 insertions(+), 27 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi index ff738a5261..59d269bf03 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi @@ -6,37 +6,10 @@ #include / { - aliases { - led-boot = &led_power_yellow; - led-failsafe = &led_power_yellow; - led-running = &led_power_blue; - led-upgrade = &led_power_yellow; - label-mac-device = ðernet; - }; - chosen { bootargs = "console=ttyS0,115200"; }; - leds { - compatible = "gpio-leds"; - - led_power_blue: power_blue { - label = "blue:power"; - gpios = <&gpio 11 GPIO_ACTIVE_LOW>; - }; - - led_power_yellow: power_yellow { - label = "yellow:power"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - wan { - label = "blue:wan"; - gpios = <&gpio 37 GPIO_ACTIVE_LOW>; - }; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts index cdf259c51a..863191bc4b 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts @@ -5,6 +5,34 @@ / { compatible = "xiaomi,mi-router-4a-100m-intl", "mediatek,mt7628an-soc"; model = "Xiaomi Mi Router 4A (100M International Edition)"; + + aliases { + led-boot = &led_power_yellow; + led-failsafe = &led_power_yellow; + led-running = &led_power_blue; + led-upgrade = &led_power_yellow; + label-mac-device = ðernet; + }; + + leds { + compatible = "gpio-leds"; + + led_power_blue: power_blue { + label = "blue:power"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + led_power_yellow: power_yellow { + label = "yellow:power"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "blue:wan"; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; + }; + }; + }; &partitions { diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts index 626b36366d..5ddc7af462 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts @@ -5,6 +5,34 @@ / { compatible = "xiaomi,mi-router-4a-100m", "mediatek,mt7628an-soc"; model = "Xiaomi Mi Router 4A (100M Edition)"; + + aliases { + led-boot = &led_power_yellow; + led-failsafe = &led_power_yellow; + led-running = &led_power_blue; + led-upgrade = &led_power_yellow; + label-mac-device = ðernet; + }; + + leds { + compatible = "gpio-leds"; + + led_power_blue: power_blue { + label = "blue:power"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + led_power_yellow: power_yellow { + label = "yellow:power"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "blue:wan"; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; + }; + }; + }; &partitions { diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts index e3aae273a9..e9bbf76e4b 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts @@ -7,8 +7,33 @@ model = "Xiaomi Mi Router 4C"; aliases { + led-boot = &led_power_yellow; + led-failsafe = &led_power_yellow; + led-running = &led_power_blue; + led-upgrade = &led_power_yellow; label-mac-device = ðernet; }; + + leds { + compatible = "gpio-leds"; + + led_power_blue: power_blue { + label = "blue:power"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + led_power_yellow: power_yellow { + label = "yellow:power"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "blue:wan"; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; + }; + + }; + }; &flash0 { -- 2.30.2