From e07c80dfc881daed67c495d99885cc045f70d89a Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Tue, 4 Oct 2016 20:34:03 +0200 Subject: [PATCH] lantiq: use aliases device tree node for leds The chosen node is clearly the wrong place for aliases. Signed-off-by: Mathias Kresin --- .../lantiq/base-files/lib/functions/lantiq.sh | 2 +- target/linux/lantiq/dts/ARV4510PW.dts | 20 +++++++++---------- target/linux/lantiq/dts/ARV4518PWR01.dtsi | 18 ++++++++--------- target/linux/lantiq/dts/ARV4519PW.dts | 18 ++++++++--------- target/linux/lantiq/dts/ARV4520PW.dts | 18 ++++++++--------- target/linux/lantiq/dts/ARV4525PW.dts | 18 ++++++++--------- target/linux/lantiq/dts/ARV452CQW.dts | 18 ++++++++--------- target/linux/lantiq/dts/ARV7506PW11.dts | 18 ++++++++--------- target/linux/lantiq/dts/ARV7510PW22.dts | 14 ++++++------- target/linux/lantiq/dts/ARV7518PW.dts | 20 +++++++++---------- target/linux/lantiq/dts/ARV7519PW.dts | 16 +++++++-------- target/linux/lantiq/dts/ARV7519RW22.dts | 12 +++++------ target/linux/lantiq/dts/ARV7525PW.dts | 16 +++++++-------- target/linux/lantiq/dts/ARV752DPW.dts | 16 +++++++-------- target/linux/lantiq/dts/ARV752DPW22.dts | 16 +++++++-------- target/linux/lantiq/dts/ARV8539PW22.dts | 18 ++++++++--------- target/linux/lantiq/dts/BTHOMEHUBV2B.dts | 14 ++++++------- target/linux/lantiq/dts/BTHOMEHUBV3A.dts | 14 ++++++------- target/linux/lantiq/dts/BTHOMEHUBV5A.dts | 14 ++++++------- target/linux/lantiq/dts/DGN1000B.dts | 12 +++++------ target/linux/lantiq/dts/DGN3500.dtsi | 18 ++++++++--------- target/linux/lantiq/dts/EASY80920.dtsi | 14 ++++++------- target/linux/lantiq/dts/FRITZ3370.dts | 16 +++++++-------- target/linux/lantiq/dts/FRITZ7320.dts | 16 +++++++-------- target/linux/lantiq/dts/FRITZ7360SL.dts | 16 +++++++-------- target/linux/lantiq/dts/H201L.dts | 18 ++++++++--------- target/linux/lantiq/dts/P2601HNFX.dts | 16 +++++++-------- target/linux/lantiq/dts/P2812HNUF1.dts | 8 +++----- target/linux/lantiq/dts/P2812HNUFX.dtsi | 16 +++++++-------- target/linux/lantiq/dts/TDW89X0.dtsi | 18 ++++++++--------- target/linux/lantiq/dts/VG3503J.dts | 12 +++++------ target/linux/lantiq/dts/VGV7510KW22.dtsi | 16 +++++++-------- target/linux/lantiq/dts/VGV7519.dtsi | 16 +++++++-------- target/linux/lantiq/dts/VR200v.dts | 16 +++++++-------- target/linux/lantiq/dts/WBMR.dts | 18 ++++++++--------- target/linux/lantiq/dts/WBMR300.dts | 16 +++++++-------- 36 files changed, 277 insertions(+), 285 deletions(-) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh index 456e54bb3f..e4eb4d723f 100644 --- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh @@ -32,7 +32,7 @@ lantiq_get_dt_led() { local label local ledpath local basepath="/sys/firmware/devicetree/base" - local nodepath="$basepath/chosen/leds/$1" + local nodepath="$basepath/aliases/led-$1" [ -f "$nodepath" ] && ledpath=$(cat "$nodepath") [ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label") diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts index bbfec2f7f9..dca7a35794 100644 --- a/target/linux/lantiq/dts/ARV4510PW.dts +++ b/target/linux/lantiq/dts/ARV4510PW.dts @@ -7,18 +7,18 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power2; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power2; + led-running = &power; - dsl = &adsl; - internet = &internet; - usb = &usb; - usb2 = &usb2; - wifi = &wifi; - }; + led-dsl = &adsl; + led-internet = &internet; + led-usb = &usb; + led-usb2 = &usb2; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi index 2145d074b3..3b29481a54 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi @@ -3,17 +3,17 @@ / { chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power; + led-running = &power; - dsl = &dsl; - internet = &online; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &online; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts index f1e61766db..932bc4a0ac 100644 --- a/target/linux/lantiq/dts/ARV4519PW.dts +++ b/target/linux/lantiq/dts/ARV4519PW.dts @@ -7,17 +7,17 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &internet_green; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &internet_green; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts index a7d529bc63..8edca24705 100644 --- a/target/linux/lantiq/dts/ARV4520PW.dts +++ b/target/linux/lantiq/dts/ARV4520PW.dts @@ -7,17 +7,17 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_blue; - failsafe = &power_red; - running = &power_blue; + aliases { + led-boot = &power_blue; + led-failsafe = &power_red; + led-running = &power_blue; - dsl = &dsl; - internet = &internet_blue; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &internet_blue; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/dts/ARV4525PW.dts index 5d2c327208..0f264ffbf7 100644 --- a/target/linux/lantiq/dts/ARV4525PW.dts +++ b/target/linux/lantiq/dts/ARV4525PW.dts @@ -5,16 +5,14 @@ / { model = "ARV4525PW - Speedport W501V Typ A"; - chosen { - leds { - /* we dont have a power led, lets use the online led */ - boot = &online; - failsafe = &online; - - dsl = &dsl; - internet = &online; - wifi = &wifi; - }; + aliases { + /* we dont have a power led, lets use the online led */ + led-boot = &online; + led-failsafe = &online; + + led-dsl = &dsl; + led-internet = &online; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts index 152b7af992..b8910421fe 100644 --- a/target/linux/lantiq/dts/ARV452CQW.dts +++ b/target/linux/lantiq/dts/ARV452CQW.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_blue; - failsafe = &power_red; - running = &power_blue; + aliases { + led-boot = &power_blue; + led-failsafe = &power_red; + led-running = &power_blue; - internet = &dsl_blue; - usb = &usb; - wifi = &wifi; - }; + led-internet = &dsl_blue; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { @@ -113,7 +113,7 @@ lantiq,pull = <0>; lantiq,output = <1>; }; - leds { + aliases { lantiq,pins = "io3", "io5", "io6", "io7", "io9"; lantiq,output = <1>; }; diff --git a/target/linux/lantiq/dts/ARV7506PW11.dts b/target/linux/lantiq/dts/ARV7506PW11.dts index 14630450fe..215d4428d5 100644 --- a/target/linux/lantiq/dts/ARV7506PW11.dts +++ b/target/linux/lantiq/dts/ARV7506PW11.dts @@ -5,16 +5,14 @@ / { model = "ARV7506PW11 - Alice/O2 IAD 4421"; - chosen { - leds { - boot = &power; - failsafe = &power_red; - running = &power; - - dsl = &dsl; - internet = &internet; - wifi = &wlan; - }; + aliases { + led-boot = &power; + led-failsafe = &power_red; + led-running = &power; + + led-dsl = &dsl; + led-internet = &internet; + led-wifi = &wlan; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts index fb03017f1d..ac974091dd 100644 --- a/target/linux/lantiq/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/dts/ARV7510PW22.dts @@ -7,15 +7,15 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power; + led-running = &power; - internet = &internet; - wifi = &wlan; - }; + led-internet = &internet; + led-wifi = &wlan; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts index 6e2b8ef6d3..7e6a28ad03 100644 --- a/target/linux/lantiq/dts/ARV7518PW.dts +++ b/target/linux/lantiq/dts/ARV7518PW.dts @@ -7,17 +7,17 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &online_green; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &online_green; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { @@ -115,7 +115,7 @@ lantiq,pull = <2>; lantiq,output = <1>; }; - leds { + aliases { lantiq,pins = "io2", "io4", "io5", "io6", "io7", "io8", "io19"; lantiq,output = <1>; }; diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts index b6e04d69da..57c1bde5ff 100644 --- a/target/linux/lantiq/dts/ARV7519PW.dts +++ b/target/linux/lantiq/dts/ARV7519PW.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power2; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power2; + led-running = &power; - dsl = &dsl; - internet = &online; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &online; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts index a15556b0f1..f1d5f63256 100644 --- a/target/linux/lantiq/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/dts/ARV7519RW22.dts @@ -7,14 +7,14 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_green; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_green; + led-running = &power_green; - internet = &internet_green; - }; + led-internet = &internet_green; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts index be1bf755a4..e8893626ab 100644 --- a/target/linux/lantiq/dts/ARV7525PW.dts +++ b/target/linux/lantiq/dts/ARV7525PW.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &power_green; - internet = &online; - wifi = &wifi; - }; + led-dsl = &power_green; + led-internet = &online; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts index a54e15cb1a..e37c795197 100644 --- a/target/linux/lantiq/dts/ARV752DPW.dts +++ b/target/linux/lantiq/dts/ARV752DPW.dts @@ -7,15 +7,15 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_red; - failsafe = &power_blue; - running = &power_red; + aliases { + led-boot = &power_red; + led-failsafe = &power_blue; + led-running = &power_red; - internet = &internet_red; - wifi = &wifi; - }; + led-internet = &internet_red; + led-wifi = &wifi; }; memory@0 { @@ -111,7 +111,7 @@ lantiq,pull = <2>; lantiq,output = <1>; }; - leds { + aliases { lantiq,pins = "io3", "io5", "io6", "io8"; lantiq,output = <1>; lantiq,pull = <0>; diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts index d7103fbd22..db4a639b41 100644 --- a/target/linux/lantiq/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/dts/ARV752DPW22.dts @@ -7,15 +7,15 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_red; - failsafe = &power_blue; - running = &power_red; + aliases { + led-boot = &power_red; + led-failsafe = &power_blue; + led-running = &power_red; - internet = &internet_red; - wifi = &wifi; - }; + led-internet = &internet_red; + led-wifi = &wifi; }; memory@0 { @@ -111,7 +111,7 @@ lantiq,open-drain = <1>; lantiq,output = <1>; }; - leds { + aliases { lantiq,pins = "io3", "io5", "io6", "io8"; lantiq,open-drain = <1>; lantiq,output = <1>; diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts index 8a6a07b274..76034fded0 100644 --- a/target/linux/lantiq/dts/ARV8539PW22.dts +++ b/target/linux/lantiq/dts/ARV8539PW22.dts @@ -5,16 +5,14 @@ / { model = "ARV8539PW22 - Speedport W 504V Typ A"; - chosen { - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; - - dsl = &dsl_green; - internet = &online_green; - wifi = &wireless_green; - }; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; + + dsl = &dsl_green; + internet = &online_green; + wifi = &wireless_green; }; memory@0 { diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts index 0165156faa..22875808c9 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts @@ -7,15 +7,15 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_orange; - failsafe = &power_red; - running = &power_blue; + aliases { + led-boot = &power_orange; + led-failsafe = &power_red; + led-running = &power_blue; - internet = &broadband_blue; - wifi = &wireless_blue; - }; + led-internet = &broadband_blue; + led-wifi = &wireless_blue; }; memory@0 { /* RAM: Samsung K4H511638F-LC 64MB */ diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts index 1d61d81af2..7879997727 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts @@ -7,15 +7,15 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_orange; - failsafe = &power_red; - running = &power_blue; + aliases { + led-boot = &power_orange; + led-failsafe = &power_red; + led-running = &power_blue; - internet = &broadband_blue; - wifi = &wireless_blue; - }; + led-internet = &broadband_blue; + led-wifi = &wireless_blue; }; memory@0 { /* RAM: Samsung K4H511638F-LC 64MB */ diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts index fcfd8c735a..fa00f7037a 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts @@ -7,15 +7,15 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_blue; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_blue; - internet = &broadband_blue; - wifi = &wireless_blue; - }; + led-internet = &broadband_blue; + led-wifi = &wireless_blue; }; memory@0 { diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts index a011c71aa2..b84eab0286 100644 --- a/target/linux/lantiq/dts/DGN1000B.dts +++ b/target/linux/lantiq/dts/DGN1000B.dts @@ -8,13 +8,13 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; - leds { - boot = &power; - failsafe = &power; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power; + led-running = &power; - dsl = &dsl; - internet = &online_green; + led-dsl = &dsl; + led-internet = &online_green; }; }; diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi index bc50e4ae65..f86ccc5d23 100644 --- a/target/linux/lantiq/dts/DGN3500.dtsi +++ b/target/linux/lantiq/dts/DGN3500.dtsi @@ -3,17 +3,17 @@ / { chosen { bootargs = "root= console=ttyLTQ0,115200"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &internet; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &internet; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi index 47b7a07f2c..57dc4574ec 100644 --- a/target/linux/lantiq/dts/EASY80920.dtsi +++ b/target/linux/lantiq/dts/EASY80920.dtsi @@ -3,15 +3,15 @@ / { chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power; + led-running = &power; - usb = &usb1; - usb2 = &usb2; - }; + led-usb = &usb1; + led-usb2 = &usb2; }; memory@0 { diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts index d802ca70b4..35880f5e20 100644 --- a/target/linux/lantiq/dts/FRITZ3370.dts +++ b/target/linux/lantiq/dts/FRITZ3370.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &info_green; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &info_green; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts index acb88b60a0..643546c4b3 100644 --- a/target/linux/lantiq/dts/FRITZ7320.dts +++ b/target/linux/lantiq/dts/FRITZ7320.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power; - running = &power; + aliases { + led-boot = &power; + led-failsafe = &power; + led-running = &power; - internet = &info_green; - dsl = &power; - wifi = &wlan; - }; + led-internet = &info_green; + led-dsl = &power; + led-wifi = &wlan; }; memory@0 { diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts index e8fdc13cb3..02e97810f6 100644 --- a/target/linux/lantiq/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/dts/FRITZ7360SL.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - internet = &info_green; - dsl = &power_green; - wifi = &wifi; - }; + led-internet = &info_green; + led-dsl = &power_green; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts index e6e514fc36..c4208e3c1f 100644 --- a/target/linux/lantiq/dts/H201L.dts +++ b/target/linux/lantiq/dts/H201L.dts @@ -7,17 +7,17 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_green; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_green; + led-running = &power_green; - dsl = &dsl; - internet = &online; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &online; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts index c1b4c617de..5ab5ae7a10 100644 --- a/target/linux/lantiq/dts/P2601HNFX.dts +++ b/target/linux/lantiq/dts/P2601HNFX.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &online; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &online; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts index 10bc4b1c05..87b2f8a6a6 100644 --- a/target/linux/lantiq/dts/P2812HNUF1.dts +++ b/target/linux/lantiq/dts/P2812HNUF1.dts @@ -5,11 +5,9 @@ / { model = "P2812HNUF1 - ZyXEL P-2812HNU-F1"; - chosen { - leds { - usb = &usb1; - usb2 = &usb2; - }; + aliases { + led-usb = &usb1; + led-usb2 = &usb2; }; fpi@10000000 { diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi index 88f4d757fc..30eee502d0 100644 --- a/target/linux/lantiq/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi @@ -3,16 +3,16 @@ / { chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl_green; - internet = &internet_green; - wifi = &wireless_green; - }; + led-dsl = &dsl_green; + led-internet = &internet_green; + led-wifi = &wireless_green; }; cputemp@0 { diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi index b3eaf7373f..d6a89fe0f7 100644 --- a/target/linux/lantiq/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/dts/TDW89X0.dtsi @@ -3,17 +3,17 @@ / { chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - /* the power led can't be controlled, use the wps led instead */ - boot = &wps; - failsafe = &wps; + aliases { + /* the power led can't be controlled, use the wps led instead */ + led-boot = &wps; + led-failsafe = &wps; - dsl = &dsl; - internet = &internet; - usb = &usb0; - usb2 = &usb2; - }; + led-dsl = &dsl; + led-internet = &internet; + led-usb = &usb0; + led-usb2 = &usb2; }; memory@0 { diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts index 1aeb4f19f8..b8437ebd12 100644 --- a/target/linux/lantiq/dts/VG3503J.dts +++ b/target/linux/lantiq/dts/VG3503J.dts @@ -7,14 +7,14 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - internet = &dsl; - }; + led-internet = &dsl; }; memory@0 { diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi index 0284831c19..4f2ae47193 100644 --- a/target/linux/lantiq/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi @@ -5,16 +5,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &internet_green; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &internet_green; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi index b2399afe7e..103a9f5a56 100644 --- a/target/linux/lantiq/dts/VGV7519.dtsi +++ b/target/linux/lantiq/dts/VGV7519.dtsi @@ -6,16 +6,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &broadband_green; - internet = &internet_green; - wifi = &wireless_green; - }; + led-dsl = &broadband_green; + led-internet = &internet_green; + led-wifi = &wireless_green; }; memory@0 { diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts index e281042f5b..8715b89852 100644 --- a/target/linux/lantiq/dts/VR200v.dts +++ b/target/linux/lantiq/dts/VR200v.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power; - failsafe = &power; + aliases { + led-boot = &power; + led-failsafe = &power; - dsl = &dsl; - internet = &internet; - usb = &usb; - usb2 = &usb; - }; + led-dsl = &dsl; + led-internet = &internet; + led-usb = &usb; + led-usb2 = &usb; }; memory@0 { diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts index ba48dd13ec..067ca87d46 100644 --- a/target/linux/lantiq/dts/WBMR.dts +++ b/target/linux/lantiq/dts/WBMR.dts @@ -7,17 +7,17 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_green; - failsafe = &power_red; - running = &power_green; + aliases { + led-boot = &power_green; + led-failsafe = &power_red; + led-running = &power_green; - dsl = &dsl; - internet = &online_green; - usb = &usb; - wifi = &wifi; - }; + led-dsl = &dsl; + led-internet = &online_green; + led-usb = &usb; + led-wifi = &wifi; }; memory@0 { diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts index 824efb7cc0..02ec172d92 100644 --- a/target/linux/lantiq/dts/WBMR300.dts +++ b/target/linux/lantiq/dts/WBMR300.dts @@ -7,16 +7,16 @@ chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + }; - leds { - boot = &power_g; - failsafe = &diag_r; - running = &power_g; + aliases { + led-boot = &power_g; + led-failsafe = &diag_r; + led-running = &power_g; - dsl = &dsl; - internet = &router_g; - wifi = &wifi_g; - }; + led-dsl = &dsl; + led-internet = &router_g; + led-wifi = &wifi_g; }; memory@0 { -- 2.25.1