diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-11-05 19:23:33 +0100 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-11-06 00:27:55 +0100 |
| commit | f4026ad24d0374bdb8704e8b6ec38e9fd85f5e0e (patch) | |
| tree | 7f01c18cd8fe81a40e6ac7999d668615af395ea2 /target/linux/ath79 | |
| parent | 763914ef1be07038eb2c862c1fe3c84de419679f (diff) | |
| download | upstream-f4026ad24d0374bdb8704e8b6ec38e9fd85f5e0e.tar.gz upstream-f4026ad24d0374bdb8704e8b6ec38e9fd85f5e0e.tar.bz2 upstream-f4026ad24d0374bdb8704e8b6ec38e9fd85f5e0e.zip | |
ath79: DTS file style update and harmonization
This applies several style adjustments that have been requested in
recent reviews to older DTS files. Despite making the code base more
consistent, this will also help to reduce review time when DTSes
are copy/pasted.
Applied changes:
- Rename gpio-keys/gpio-leds to keys/leds
- Remove node labels that are not used
- Use label property for partitions
- Prefix led node labels with "led_"
- Remove redundant includes
- Harmonize new lines after status property
- Several smaller style fixes
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79')
120 files changed, 749 insertions, 660 deletions
diff --git a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts index 64f471649e..536432e250 100644 --- a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts +++ b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts @@ -11,16 +11,16 @@ model = "I-O DATA WN-AG300DGR"; aliases { - led-boot = &router; - led-failsafe = &router; - led-running = &router; - led-upgrade = &router; + led-boot = &led_router; + led-failsafe = &led_router; + led-running = &led_router; + led-upgrade = &led_router; }; leds { compatible = "gpio-leds"; - router: router { + led_router: router { label = "wn-ag300dgr:green:router"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -108,9 +108,10 @@ }; &spi { - num-cs = <1>; status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; @@ -212,5 +213,6 @@ &wmac { status = "okay"; + qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts index 8a70b597b0..c08a1277c2 100644 --- a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts +++ b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts @@ -11,10 +11,10 @@ compatible = "sitecom,wlr-7100", "qca,ar9344"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -41,7 +41,7 @@ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - power: power { + led_power: power { label = "wlr-7100:amber:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -100,9 +100,10 @@ }; &spi { - num-cs = <1>; status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi index ba9b588bec..f5dfa77912 100644 --- a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi +++ b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &led_green_status; - led-failsafe = &led_yellow_status; - led-running = &led_green_status; - led-upgrade = &led_yellow_status; + led-boot = &led_status_green; + led-failsafe = &led_status_yellow; + led-running = &led_status_green; + led-upgrade = &led_status_yellow; }; leds { @@ -33,12 +33,12 @@ linux,default-trigger = "phy0tpt"; }; - led_green_status: green_status { + led_status_green: status_green { label = "bluesocket:green:status"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; - led_yellow_status: yellow_status { + led_status_yellow: status_yellow { label = "bluesocket:yellow:status"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; @@ -79,6 +79,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts index 91f6e1dc02..d2a56f83ce 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power_green; - led-failsafe = &power_red; - led-running = &power_green; - led-upgrade = &power_green; + led-boot = &led_power_green; + led-failsafe = &led_power_red; + led-running = &led_power_green; + led-upgrade = &led_power_green; label-mac-device = ð0; }; @@ -32,23 +32,23 @@ leds { compatible = "gpio-leds"; - power_green: power_green { + led_power_green: power_green { label = "ap-105:green:power"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; - power_red: power_red { + led_power_red: power_red { label = "ap-105:red:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; panic-indicator; }; - wifi_2g_red: wifi_2g_red { + wifi_2g_red { label = "ap-105:red:wlan2g"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; - wifi_5g_red: wifi_5g_red { + wifi_5g_red { label = "ap-105:red:wlan5g"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; @@ -151,6 +151,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts index f51bc0f771..2e00de8887 100644 --- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts +++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts @@ -11,9 +11,9 @@ model = "Buffalo WZR-HP-AG300H/WZR-600DHP"; aliases { - led-boot = &diag; - led-failsafe = &diag; - led-upgrade = &diag; + led-boot = &led_diag; + led-failsafe = &led_diag; + led-upgrade = &led_diag; }; chosen { @@ -27,19 +27,18 @@ clock-frequency = <40000000>; }; - gpio-leds { + leds { compatible = "gpio-leds"; - diag: diag { + led_diag: diag { label = "buffalo:red:diag"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; }; ath9k-leds { - // those leds are indeed attached to the wifi chips - compatible = "gpio-leds"; + band2g_a { label = "buffalo:amber:band2g"; gpios = <&ath9k0 1 GPIO_ACTIVE_LOW>; @@ -228,6 +227,7 @@ &spi { status = "okay"; + num-cs = <2>; cs-gpios = <0>, <0>; diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts index 11b23d4879..92de193aba 100644 --- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts +++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts @@ -11,10 +11,10 @@ model = "D-Link DIR825B1"; aliases { - led-boot = &orange_power; - led-failsafe = &orange_power; - led-running = &blue_power; - led-upgrade = &orange_power; + led-boot = &led_power_orange; + led-failsafe = &led_power_orange; + led-running = &led_power_blue; + led-upgrade = &led_power_orange; }; chosen { @@ -30,35 +30,36 @@ leds { compatible = "gpio-leds"; - blue_usb { + + usb { label = "d-link:blue:usb"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; trigger-sources = <&usb_ochi_port>, <&usb_echi_port>; linux,default-trigger = "usbport"; }; - orange_power: orange_power { + led_power_orange: power_orange { label = "d-link:orange:power"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "on"; }; - blue_power: blue_power { + led_power_blue: power_blue { label = "d-link:blue:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; - blue_wps { + wps { label = "d-link:blue:wps"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; - orange_planet { + planet_orange { label = "d-link:orange:planet"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; - blue_planet { + planet_blue { label = "d-link:blue:planet"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; @@ -173,6 +174,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -220,6 +222,7 @@ ð0 { status = "okay"; + pll-data = <0x11110000 0x00001099 0x00991099>; fixed-link { @@ -230,6 +233,7 @@ ð1 { status = "okay"; + pll-data = <0x11110000 0x00001099 0x00991099>; phy-handle = <&phy4>; diff --git a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts index 9dc92a482d..cce95d7dea 100644 --- a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts +++ b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts @@ -20,10 +20,10 @@ }; aliases { - led-boot = &d2; - led-failsafe = &d2; - led-running = &d2; - led-upgrade = &d2; + led-boot = &led_d2; + led-failsafe = &led_d2; + led-running = &led_d2; + led-upgrade = &led_d2; }; extosc: ref { @@ -36,7 +36,7 @@ leds { compatible = "gpio-leds"; - d2: d2 { + led_d2: d2 { label = "ja76pf2:green:d2"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; @@ -105,6 +105,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi index 070f450778..7d842af060 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi +++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi @@ -8,10 +8,10 @@ / { aliases { - led-boot = &power_orange; - led-failsafe = &power_orange; - led-running = &power_green; - led-upgrade = &power_orange; + led-boot = &led_power_orange; + led-failsafe = &led_power_orange; + led-running = &led_power_green; + led-upgrade = &led_power_orange; label-mac-device = ð0; }; @@ -37,7 +37,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; wps { @@ -45,12 +45,12 @@ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; - power_green: power_green { + led_power_green: power_green { label = "netgear:green:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; - power_orange: power_orange { + led_power_orange: power_orange { label = "netgear:orange:power"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -69,6 +69,7 @@ ath9k-leds { compatible = "gpio-leds"; + wlan2g { label = "netgear:green:wlan2g"; gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>; @@ -105,6 +106,7 @@ rtl8366s { compatible = "realtek,rtl8366s"; + gpio-sda = <&gpio 5 GPIO_ACTIVE_HIGH>; gpio-sck = <&gpio 7 GPIO_ACTIVE_HIGH>; @@ -177,6 +179,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi index f21ffecc05..4f52e3cc40 100644 --- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi +++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &rf; - led-failsafe = &rf; - led-running = &rf; - led-upgrade = &rf; + led-boot = &led_rf; + led-failsafe = &led_rf; + led-running = &led_rf; + led-upgrade = &led_rf; }; extosc: ref { @@ -28,7 +28,7 @@ leds { compatible = "gpio-leds"; - rf: rf_green { + led_rf: rf_green { label = "ubnt:green:rf"; gpios = <&gpio 2 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts index fcd17b8d13..a2d3a99430 100644 --- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts +++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts @@ -11,9 +11,9 @@ model = "Buffalo WHR-G301N"; aliases { - led-boot = &diag; - led-failsafe = &diag; - led-upgrade = &diag; + led-boot = &led_diag; + led-failsafe = &led_diag; + led-upgrade = &led_diag; }; keys { @@ -50,7 +50,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&switch_led_pins>; @@ -60,7 +60,7 @@ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; - diag: diag { + led_diag: diag { label = "whr-g301n:red:diag"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; @@ -109,6 +109,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts index 5660ea5caf..c231f4721c 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power_amber; - led-failsafe = &power_amber; - led-running = &power_green; - led-upgrade = &power_amber; + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; label-mac-device = ð1; }; @@ -54,12 +54,12 @@ pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>; - power_green: power_green { + led_power_green: power_green { label = "netgear:green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; - power_amber: power_amber { + led_power_amber: power_amber { label = "netgear:amber:power"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "keep"; @@ -134,6 +134,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index 4bff7c8b78..4ce7a0ec3d 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -8,10 +8,10 @@ / { aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = ð1; }; @@ -33,7 +33,7 @@ pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>; - power: power { + led_power: power { label = "netgear:green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; @@ -57,7 +57,7 @@ ath9k-leds { compatible = "gpio-leds"; - wlan: wlan { + wlan { label = "netgear:green:wlan"; gpios = <&ath9k 1 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; @@ -67,6 +67,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi index b017aa3597..147fcad666 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi @@ -32,7 +32,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&switch_led_pins>; @@ -86,6 +86,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts index deb031b353..4d080c82f8 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power_amber; - led-failsafe = &power_amber; - led-running = &power_green; - led-upgrade = &power_amber; + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; label-mac-device = ð1; }; @@ -116,12 +116,12 @@ ath9k-leds { compatible = "gpio-leds"; - power_green: power_green { + led_power_green: power_green { label = "netgear:green:power"; gpios = <&ath9k 3 GPIO_ACTIVE_LOW>; }; - power_amber: power_amber { + led_power_amber: power_amber { label = "netgear:amber:power"; gpios = <&ath9k 2 GPIO_ACTIVE_LOW>; default-state = "keep"; @@ -137,6 +137,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi index 1ce4d11835..4c5ae697d6 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &power_amber; - led-failsafe = &power_amber; - led-running = &power_green; - led-upgrade = &power_amber; + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; label-mac-device = ð1; }; @@ -117,12 +117,12 @@ ath9k-leds { compatible = "gpio-leds"; - power_green: power_green { + led_power_green: power_green { label = "netgear:green:power"; gpios = <&ath9k 2 GPIO_ACTIVE_LOW>; }; - power_amber: power_amber { + led_power_amber: power_amber { label = "netgear:amber:power"; gpios = <&ath9k 1 GPIO_ACTIVE_LOW>; default-state = "keep"; diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi index 536f49b835..09a239f67e 100644 --- a/target/linux/ath79/dts/ar7241_tplink.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink.dtsi @@ -32,7 +32,7 @@ }; }; - gpio_leds: gpio-leds { + leds: leds { compatible = "gpio-leds"; led_system: system { @@ -49,6 +49,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi index 04403637b6..9d4f3f2027 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi @@ -15,7 +15,7 @@ }; }; -&gpio_leds { +&leds { led3g { label = "tp-link:green:3g"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts index 162b5f2838..64833bf2c9 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts +++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts @@ -36,7 +36,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; led_system: system { @@ -95,6 +95,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts index f12d4341c6..03306de5d9 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -8,17 +8,17 @@ model = "Ubiquiti AirRouter"; aliases { - led-boot = &globe; - led-failsafe = &globe; - led-running = &globe; - led-upgrade = &globe; + led-boot = &led_globe; + led-failsafe = &led_globe; + led-running = &led_globe; + led-upgrade = &led_globe; label-mac-device = &wifi; }; airrouter-leds { compatible = "gpio-leds"; - globe: globe { + led_globe: globe { label = "ubnt:green:globe"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts index 25e3fe0278..3e73eba9ed 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts @@ -11,10 +11,10 @@ model = "Ubiquiti UniFi AP"; aliases { - led-boot = &dome_green; - led-failsafe = &dome_green; - led-running = &dome_green; - led-upgrade = &dome_green; + led-boot = &led_dome_green; + led-failsafe = &led_dome_green; + led-running = &led_dome_green; + led-upgrade = &led_dome_green; label-mac-device = &wifi; }; @@ -36,12 +36,13 @@ leds { compatible = "gpio-leds"; - dome_green: dome-green { + + led_dome_green: dome_green { label = "ubnt:green:dome"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; - dome-orange { + dome_orange { label = "ubnt:orange:dome"; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; }; @@ -58,6 +59,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi index 787a01771e..337da5b4b7 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi @@ -1,14 +1,11 @@ // 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; + led-boot = &led_link4; + led-failsafe = &led_link4; label-mac-device = &wifi; }; @@ -29,7 +26,7 @@ gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; - link4: link4 { + led_link4: link4 { label = "ubnt:green:link4"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts index dbf4569980..14c80963d5 100644 --- a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts +++ b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts @@ -11,10 +11,10 @@ model = "AVM FRITZ!WLAN Repeater 300E"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = &ath9k; }; @@ -32,7 +32,7 @@ leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "fritz300e:green:power"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -96,6 +96,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts index ac3230f378..d62878e508 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts @@ -8,10 +8,13 @@ model = "Buffalo BHR-4GRV"; }; -ð0 { - mtd-mac-address = <&art 0x0>; +&leds { + sec_vpn { + label = "buffalo:orange:vpn"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; }; -&sec_vpn { - label = "buffalo:orange:vpn"; +ð0 { + mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi index 3b5a4dd13d..4a848cb896 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi @@ -8,9 +8,9 @@ / { aliases { - led-boot = &diag; - led-failsafe = &diag; - led-upgrade = &diag; + led-boot = &led_diag; + led-failsafe = &led_diag; + led-upgrade = &led_diag; }; extosc: ref { @@ -37,14 +37,10 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; - sec_vpn: sec_vpn { - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - diag: diag { + led_diag: diag { label = "buffalo:red:diag"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; @@ -111,6 +107,7 @@ &spi { status = "okay"; + cs-gpios = <0>, <0>; num-cs = <2>; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts index 8ac4df2194..e3971d1e95 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts @@ -11,9 +11,9 @@ model = "Buffalo WZR-HP-G302H A1A0"; aliases { - led-boot = &diag; - led-failsafe = &diag; - led-upgrade = &diag; + led-boot = &led_diag; + led-failsafe = &led_diag; + led-upgrade = &led_diag; }; extosc: ref { @@ -66,7 +66,7 @@ leds { compatible = "gpio-leds"; - diag: diag { + led_diag: diag { label = "buffalo:red:diag"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; @@ -163,6 +163,7 @@ &spi { status = "okay"; + cs-gpios = <0>, <0>; num-cs = <2>; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts index 37c98604ad..16a617a254 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "ar7242_buffalo_wzr-bhr.dtsi" / { @@ -60,12 +57,15 @@ }; }; -ð0 { - mtd-mac-address = <&art 0x1002>; +&leds { + sec_vpn { + label = "buffalo:orange:security"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; }; -&sec_vpn { - label = "buffalo:orange:security"; +ð0 { + mtd-mac-address = <&art 0x1002>; }; &pcie { diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts index e683de5aee..e6ea8b68e2 100644 --- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts +++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts @@ -11,10 +11,10 @@ model = "TP-Link TL-WR2543N/ND"; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_wps; + led-failsafe = &led_wps; + led-running = &led_wps; + led-upgrade = &led_wps; label-mac-device = ð0; }; @@ -49,7 +49,7 @@ leds { compatible = "gpio-leds"; - system: wps { + led_wps: wps { label = "tplink:green:wps"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; @@ -102,6 +102,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts index 2fff08195b..804b71170e 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts @@ -11,10 +11,10 @@ model = "TP-Link TL-WA901ND v2"; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; @@ -45,7 +45,7 @@ leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; @@ -73,6 +73,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -126,6 +127,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts index 88b9d36a2d..3728b682c8 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts @@ -11,10 +11,10 @@ model = "TP-Link TL-WR1043ND v1"; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; @@ -44,6 +44,7 @@ leds { compatible = "gpio-leds"; + usb { label = "tp-link:green:usb"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; @@ -51,7 +52,7 @@ linux,default-trigger = "usbport"; }; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; @@ -104,6 +105,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -151,6 +153,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts index a8433532f1..70754c905e 100644 --- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts +++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts @@ -12,16 +12,16 @@ aliases { serial0 = &uart; - led-boot = &wlan; - led-failsafe = &wlan; - led-upgrade = &wlan; + led-boot = &led_wlan; + led-failsafe = &led_wlan; + led-upgrade = &led_wlan; label-mac-device = ð0; }; leds { compatible = "gpio-leds"; - wlan: wlan { + led_wlan: wlan { label = "gl-ar150:orange:wlan"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; @@ -80,9 +80,10 @@ }; &spi { - num-chipselects = <1>; status = "okay"; + num-chipselects = <1>; + flash@0 { compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; @@ -140,6 +141,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&art 0x0>; }; diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts index ffb28c7417..92484f9331 100644 --- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts +++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts @@ -12,15 +12,15 @@ aliases { serial0 = &uart; - led-boot = &wlan; - led-failsafe = &wlan; - led-upgrade = &wlan; + led-boot = &led_wlan; + led-failsafe = &led_wlan; + led-upgrade = &led_wlan; }; leds { compatible = "gpio-leds"; - wlan: wlan { + led_wlan: wlan { label = "air-pen:blue:wlan"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; @@ -69,9 +69,10 @@ }; &spi { - num-cs = <1>; status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; @@ -135,11 +136,13 @@ ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&art 0x2>; }; diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts index 82e6f74074..971d158faf 100644 --- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts +++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts @@ -12,9 +12,9 @@ aliases { label-mac-device = &wmac; - led-boot = &vpn; - led-failsafe = &vpn; - led-upgrade = &vpn; + led-boot = &led_vpn; + led-failsafe = &led_vpn; + led-upgrade = &led_vpn; serial0 = &uart; }; @@ -42,7 +42,7 @@ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; - vpn: vpn { + led_vpn: vpn { label = "ap121f:green:vpn"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; @@ -57,6 +57,7 @@ ð0 { status = "okay"; + mtd-mac-address = <&art 0x0>; gmac-config { @@ -68,6 +69,7 @@ ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; @@ -77,6 +79,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -130,5 +133,6 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index 639c6523d6..3489a972d4 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -11,17 +11,17 @@ compatible = "embeddedwireless,dorin", "qca,ar9331"; aliases { - led-boot = &status; - led-failsafe = &status; - led-running = &status; - led-upgrade = &status; + led-boot = &led_status; + led-failsafe = &led_status; + led-running = &led_status; + led-upgrade = &led_status; serial0 = &uart; }; leds { compatible = "gpio-leds"; - status: status { + led_status: status { label = "dorin:green:status"; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; }; @@ -62,9 +62,10 @@ }; &spi { - num-chipselects = <1>; status = "okay"; + num-chipselects = <1>; + flash@0 { compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; @@ -115,5 +116,6 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts index 0d8c4defa8..9b222904e1 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts @@ -12,10 +12,10 @@ aliases { serial0 = &uart; - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_wps; + led-failsafe = &led_wps; + led-running = &led_wps; + led-upgrade = &led_wps; label-mac-device = ð0; }; @@ -33,7 +33,7 @@ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; - system: wps { + led_wps: wps { label = "tp-link:green:wps"; gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; @@ -113,9 +113,10 @@ }; &spi { - num-chipselects = <1>; status = "okay"; + num-chipselects = <1>; + /* Spansion S25FL032PIF SPI flash */ flash@0 { compatible = "jedec,spi-nor"; @@ -168,11 +169,13 @@ ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts index 005e263894..e8a3dfbce7 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts @@ -18,6 +18,7 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; pinctrl-0 = <&switch_led_disable_pins>; @@ -107,9 +108,10 @@ }; &spi { - num-chipselects = <1>; status = "okay"; + num-chipselects = <1>; + flash@0 { compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; @@ -155,11 +157,13 @@ ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi index c4ec8a840e..a8e0331f08 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi @@ -9,10 +9,10 @@ / { aliases { serial0 = &uart; - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; @@ -30,7 +30,7 @@ leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tl-wr703n:blue:system"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; @@ -47,6 +47,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -65,7 +66,7 @@ read-only; }; - firmware: partition@20000 { + partition@20000 { compatible = "tplink,firmware"; reg = <0x20000 0x3d0000>; label = "firmware"; @@ -95,6 +96,7 @@ ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; @@ -118,6 +120,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi index c9be157cc9..4fb06494a4 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi @@ -12,10 +12,10 @@ aliases { serial0 = &uart; - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = &wmac; }; @@ -39,6 +39,7 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; pinctrl-0 = <&switch_led_disable_pins>; @@ -67,7 +68,7 @@ gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; }; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; @@ -87,6 +88,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -151,6 +153,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts index a6348d4cba..222516f9b7 100644 --- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts +++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts @@ -12,10 +12,10 @@ aliases { serial0 = &uart; - led-boot = &status; - led-failsafe = &status; - led-running = &status; - led-upgrade = &status; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -42,7 +42,7 @@ leds { compatible = "gpio-leds"; - status: power { + led_power: power { label = "pcs:amber:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts index 8029de5495..46b6053cce 100644 --- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts +++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts @@ -12,10 +12,10 @@ aliases { serial0 = &uart; - led-boot = &wifi; - led-failsafe = &wifi; - led-running = &wifi; - led-upgrade = &wifi; + led-boot = &led_wifi; + led-failsafe = &led_wifi; + led-running = &led_wifi; + led-upgrade = &led_wifi; }; i2c { @@ -89,7 +89,7 @@ gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; }; - wifi: wifi { + led_wifi: wifi { label = "wmb001n:blue:wifi"; gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi index 5dbcac34af..f99b6da67e 100644 --- a/target/linux/ath79/dts/ar9341_tplink.dtsi +++ b/target/linux/ath79/dts/ar9341_tplink.dtsi @@ -9,10 +9,10 @@ / { aliases { serial0 = &uart; - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = &wmac; }; @@ -33,7 +33,7 @@ leds: leds { compatible = "gpio-leds"; - system: power { + led_power: power { label = "tp-link:green:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts index 86a316b518..d9b0ee86f5 100644 --- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts @@ -37,10 +37,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts index 5daa06711b..1ced60d5fd 100644 --- a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts +++ b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts @@ -11,16 +11,16 @@ model = "I-O DATA ETG3-R"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "etg3-r:green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -49,9 +49,10 @@ }; &spi { - num-cs = <1>; status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi index 24fe34b3a7..3232db981b 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi +++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi @@ -10,10 +10,10 @@ model = "Ubiquiti Networks XW board"; aliases { - led-boot = &system; - led-running = &system; - led-upgrade = &system; - led-failsafe = &system; + led-boot = &led_link4; + led-running = &led_link4; + led-upgrade = &led_link4; + led-failsafe = &led_link4; label-mac-device = &wmac; }; @@ -35,7 +35,7 @@ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - system: link4 { + led_link4: link4 { label = "ubnt:green:link4"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts index f96fe41145..ede248759b 100644 --- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts +++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts @@ -11,10 +11,10 @@ model = "Aerohive HiveAP 121"; aliases { - led-boot = &power_white; - led-failsafe = &power_orange; - led-running = &power_white; - led-upgrade = &power_orange; + led-boot = &led_power_white; + led-failsafe = &led_power_orange; + led-running = &led_power_white; + led-upgrade = &led_power_orange; label-mac-device = ð0; }; @@ -36,12 +36,12 @@ leds { compatible = "gpio-leds"; - power_orange: power_orange { + led_power_orange: power_orange { label = "hiveap-121:orange:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - power_white: power_white { + led_power_white: power_white { label = "hiveap-121:white:power"; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; }; @@ -120,6 +120,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts index 33c117b2f4..66ac718264 100644 --- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts +++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts @@ -12,9 +12,9 @@ aliases { serial0 = &uart; - led-boot = &wan; - led-failsafe = &wan; - led-upgrade = &wan; + led-boot = &led_wan; + led-failsafe = &led_wan; + led-upgrade = &led_wan; label-mac-device = ð0; }; @@ -24,7 +24,7 @@ pinctrl-names = "default"; pinctrl-0 = <&led_rssimediumhigh_pin>; - wan: wan { + led_wan: wan { label = "cf-e120a-v3:green:wan"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; @@ -74,13 +74,14 @@ }; &pinmux { - led_rssimediumhigh_pin: pinmux_rssimediumhigh_pin { - pinctrl-single,bits = <0x10 0x0 0xff>; - }; + led_rssimediumhigh_pin: pinmux_rssimediumhigh_pin { + pinctrl-single,bits = <0x10 0x0 0xff>; + }; }; &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -93,7 +94,7 @@ #address-cells = <1>; #size-cells = <1>; - uboot: partition@0 { + partition@0 { label = "u-boot"; reg = <0x000000 0x010000>; read-only; @@ -105,13 +106,13 @@ read-only; }; - firmware: partition@20000 { + partition@20000 { compatible = "denx,uimage"; label = "firmware"; reg = <0x020000 0x7d0000>; }; - nvram: partition@7f0000 { + partition@7f0000 { label = "nvram"; reg = <0x7f0000 0x010000>; read-only; diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts index f060e29eef..882ec5e13a 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts +++ b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts @@ -8,10 +8,10 @@ compatible = "dlink,dir-825-c1", "qca,ar9344"; aliases { - led-boot = &orange_power; - led-failsafe = &orange_power; - led-running = &blue_power; - led-upgrade = &orange_power; + led-boot = &led_power_orange; + led-failsafe = &led_power_orange; + led-running = &led_power_blue; + led-upgrade = &led_power_orange; serial0 = &uart; }; @@ -21,40 +21,40 @@ pinctrl-names = "default"; pinctrl-0 = <&enable_gpio_11>; - blue_power: blue_power { + led_power_blue: power_blue { label = "d-link:blue:power"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; - blue_usb { + usb { label = "d-link:blue:usb"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; linux,default-trigger = "usbport"; trigger-sources = <&hub_port1>; }; - blue_wan { + wan_blue { label = "d-link:blue:wan"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; - blue_wlan2g { + wlan2g { label = "d-link:blue:wlan2g"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; - blue_wps { + wps { label = "d-link:blue:wps"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; - orange_power: orange_power { + led_power_orange: power_orange { label = "d-link:orange:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - orange_wan { + wan_orange { label = "d-link:orange:wan"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; }; @@ -63,7 +63,7 @@ leds-ath9k { compatible = "gpio-leds"; - blue_wlan5g { + wlan5g { label = "d-link:blue:wlan5g"; gpios = <&ath9k 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts index 29f30028b2..48853a270a 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts +++ b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts @@ -8,37 +8,37 @@ compatible = "dlink,dir-835-a1", "qca,ar9344"; aliases { - led-boot = &orange_power; - led-failsafe = &orange_power; - led-running = &green_power; - led-upgrade = &orange_power; + led-boot = &led_power_orange; + led-failsafe = &led_power_orange; + led-running = &led_power_green; + led-upgrade = &led_power_orange; serial0 = &uart; }; leds { compatible = "gpio-leds"; - green_power: green_power { + led_power_green: power_green { label = "d-link:green:power"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; - green_wan { + wan_green { label = "d-link:green:wan"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; - green_wps { + wps { label = "d-link:green:wps"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; - orange_power: orange_power { + led_power_orange: power_orange { label = "d-link:orange:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - orange_wan { + wan_orange { label = "d-link:orange:wan"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts index c2c395e8cf..08cd84e51e 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts +++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power_amber; - led-failsafe = &power_amber; - led-running = &power_green; - led-upgrade = &power_amber; + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; label-mac-device = ð0; }; @@ -50,12 +50,12 @@ pinctrl-names = "default"; pinctrl-0 = <&enable_gpio_11>; - power_green: power_green { + led_power_green: power_green { label = "netgear:green:power"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; - power_amber: power_amber { + led_power_amber: power_amber { label = "netgear:amber:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; default-state = "keep"; diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts index 9e3177acae..e7186425f3 100644 --- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts +++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; leds { @@ -36,7 +36,7 @@ linux,default-trigger = "phy0tpt"; }; - system: system { + led_system: system { label = "raccoon:blue:sys"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; @@ -76,10 +76,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts index 390beebab5..50a069cb63 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts @@ -12,10 +12,10 @@ aliases { serial0 = &uart; - led-boot = &status; - led-failsafe = &status; - led-running = &running; - led-upgrade = &status; + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; }; keys { @@ -35,12 +35,12 @@ leds { compatible = "gpio-leds"; - status: power_amber { + led_power_amber: power_amber { label = "pcs:amber:power"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - running: power_green { + led_power_green: power_green { label = "pcs:green:power"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -83,10 +83,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts index 6589101099..a43ac4e935 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts @@ -12,10 +12,10 @@ aliases { serial0 = &uart; - led-boot = &status; - led-failsafe = &status; - led-running = &status; - led-upgrade = &status; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -42,7 +42,7 @@ leds { compatible = "gpio-leds"; - status: power { + led_power: power { label = "pcs:amber:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>, <&gpio 4 GPIO_ACTIVE_LOW>; @@ -75,10 +75,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi index e1ffc29e83..ff96401afc 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi @@ -5,10 +5,10 @@ / { aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; leds { @@ -34,7 +34,7 @@ gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; - system: link4 { + led_system: link4 { label = "tp-link:green:link4"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts index eaf0acc164..2b0f52cf4f 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts @@ -8,15 +8,15 @@ compatible = "tplink,cpe610-v1", "qca,ar9344"; aliases { - led-boot = &system; - led-failsafe = &system; - led-upgrade = &system; + led-boot = &led_lan; + led-failsafe = &led_lan; + led-upgrade = &led_lan; }; leds { compatible = "gpio-leds"; - system: lan { + led_lan: lan { label = "tp-link:green:lan"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; @@ -40,5 +40,6 @@ ð1 { status = "okay"; + compatible = "syscon", "simple-mfd"; }; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi index 9ef7906365..124f4d50b2 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi @@ -7,10 +7,10 @@ / { aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; leds: leds { @@ -22,7 +22,7 @@ linux,default-trigger = "phy0tpt"; }; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -71,10 +71,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts index a9f7e6e9a3..48dcf12305 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts +++ b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { @@ -39,7 +39,7 @@ gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; - power: power { + led_power: power { label = "mynet-n750:blue:power"; gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; }; @@ -87,10 +87,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; @@ -179,11 +179,13 @@ &wmac { status = "okay"; + qca,no-eeprom; }; &mdio0 { status = "okay"; + phy-mask = <0>; switch0@1f { diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts index 49c6784151..3df601a73a 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts +++ b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "mynet-wifi-rangeextender:blue:power"; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; /* LED has no off state. It's either on or it blinks */ @@ -87,10 +87,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = /* "s25fl064k", */ "jedec,spi-nor"; reg = <0>; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts index b29dc173de..433a7e9c5f 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts @@ -12,9 +12,9 @@ aliases { serial0 = &uart; - led-boot = &rssihigh; - led-failsafe = &rssihigh; - led-upgrade = &rssihigh; + led-boot = &led_rssihigh; + led-failsafe = &led_rssihigh; + led-upgrade = &led_rssihigh; label-mac-device = ð1; }; @@ -53,7 +53,7 @@ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - rssihigh: rssihigh { + led_rssihigh: rssihigh { label = "cf-e313ac:green:rssihigh"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts index fa98f75238..192b7112a9 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts @@ -12,9 +12,9 @@ aliases { serial0 = &uart; - led-boot = &system; - led-failsafe = &system; - led-upgrade = &system; + led-boot = &led_rssihigh; + led-failsafe = &led_rssihigh; + led-upgrade = &led_rssihigh; }; leds { @@ -48,7 +48,7 @@ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - system: rssihigh { + led_rssihigh: rssihigh { label = "cf-e314n-v2:green:signal4"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts index 2ece81e0c9..242dccdcf9 100644 --- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts +++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts @@ -10,6 +10,13 @@ compatible = "engenius,ews511ap", "qca,qca9531"; model = "EnGenius EWS511AP"; + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + keys { compatible = "gpio-keys"; @@ -23,17 +30,10 @@ }; }; - aliases { - led-boot = &power_led; - led-failsafe = &power_led; - led-running = &power_led; - led-upgrade = &power_led; - }; - leds { compatible = "gpio-leds"; - power_led: power { + led_power: power { label = "ews511ap:amber:power"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -91,6 +91,7 @@ &spi { status = "okay"; + num-cs = <0>; flash@0 { @@ -131,6 +132,7 @@ ð0 { status = "okay"; + phy-handle = <&swphy4>; }; @@ -140,5 +142,6 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts index e6b5be9244..130944f4f5 100644 --- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts @@ -11,10 +11,10 @@ model = "TP-Link Archer D50 v1"; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = &wmac; }; @@ -64,7 +64,7 @@ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - system: system { + led_system: system { label = "tp-link:white:system"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -156,6 +156,7 @@ ð0 { status = "okay"; + phy-handle = <&swphy4>; mtd-mac-address = <&romfile 0xf100>; @@ -164,6 +165,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&romfile 0xf100>; }; diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts index 7d77352f84..eccfc4860d 100644 --- a/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca953x_tplink_tl-wr810n.dtsi" / { diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts index da5b6dc7db..1caae75f1d 100644 --- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts +++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts @@ -11,10 +11,10 @@ compatible = "yuncore,a770", "qca,qca9531"; aliases { - led-boot = &status; - led-failsafe = &status; - led-running = &status; - led-upgrade = &status; + led-boot = &led_status; + led-failsafe = &led_status; + led-running = &led_status; + led-upgrade = &led_status; }; chosen { @@ -40,7 +40,7 @@ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - status: status { + led_status: status { label = "a770:green:status"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; default-state = "keep"; diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts index d6eef42f3f..0d01342685 100644 --- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts +++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts @@ -12,9 +12,9 @@ aliases { serial0 = &uart; - led-boot = &wan; - led-failsafe = &wan; - led-upgrade = &wan; + led-boot = &led_wan; + led-failsafe = &led_wan; + led-upgrade = &led_wan; }; leds { @@ -23,7 +23,7 @@ pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>; - wan: wan { + led_wan: wan { label = "cf-e110n-v2:green:wan"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; @@ -92,6 +92,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -137,12 +138,14 @@ ð0 { status = "okay"; + mtd-mac-address = <&art 0x0>; phy-handle = <&swphy4>; }; ð1 { status = "okay"; + mtd-mac-address = <&art 0x1002>; gmac-config { @@ -152,6 +155,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&art 0x6>; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi index dc8d92e0b9..5b273d4737 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; @@ -42,7 +42,7 @@ gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; - system: link4 { + led_system: link4 { label = "tp-link:green:link4"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr810n-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr810n-v2.dts index a98228d358..497fdd6bab 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr810n-v2.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr810n-v2.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca953x_tplink_tl-wr810n.dtsi" / { diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v10.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v10.dts index 2a4d0a1921..9d6a32352d 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v10.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v10.dts @@ -8,9 +8,9 @@ model = "TP-Link TL-WR841N/ND v10"; aliases { - led-boot = &qss_led; - led-failsafe = &qss_led; - led-running = &qss_led; - led-upgrade = &qss_led; + led-boot = &led_qss; + led-failsafe = &led_qss; + led-running = &led_qss; + led-upgrade = &led_qss; }; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi index 8ee7d149b9..ca95981008 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi @@ -5,15 +5,15 @@ / { aliases { - led-boot = &system_led; - led-failsafe = &system_led; - led-running = &system_led; - led-upgrade = &system_led; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; }; -&gpio_leds { - system_led: system { +&leds { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts index d8c4546f49..6de3ab36be 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts @@ -8,9 +8,9 @@ model = "TP-Link TL-WR841N/ND v9"; aliases { - led-boot = &qss_led; - led-failsafe = &qss_led; - led-running = &qss_led; - led-upgrade = &qss_led; + led-boot = &led_qss; + led-failsafe = &led_qss; + led-running = &led_qss; + led-upgrade = &led_qss; }; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi index 61777027ed..e3d244ee7b 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi @@ -15,7 +15,7 @@ label-mac-device = &wmac; }; - gpio_leds: leds { + leds: leds { compatible = "gpio-leds"; wifi { @@ -24,7 +24,7 @@ linux,default-trigger = "phy0tpt"; }; - qss_led: qss { + led_qss: qss { label = "tp-link:green:qss"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; @@ -80,6 +80,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -119,6 +120,7 @@ ð0 { status = "okay"; + phy-handle = <&swphy4>; mtd-mac-address = <&uboot 0x1fc00>; @@ -127,6 +129,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts index 7f2fd4103a..497b0cd26c 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts @@ -11,17 +11,17 @@ model = "TP-Link TL-WR842N v3"; aliases { - led-boot = &power_led; - led-failsafe = &power_led; - led-running = &power_led; - led-upgrade = &power_led; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = ð1; }; - gpio_leds: leds { + leds { compatible = "gpio-leds"; - power_led: power { + led_power: power { label = "tp-link:green:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -116,6 +116,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -155,6 +156,7 @@ ð0 { status = "okay"; + phy-handle = <&swphy4>; mtd-mac-address = <&uboot 0x1fc00>; @@ -163,6 +165,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi index 649e538fc0..c5fd7166a0 100644 --- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi +++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi @@ -19,7 +19,7 @@ label-mac-device = ð1; }; - gpio_leds: leds { + leds { compatible = "gpio-leds"; led_system: system { @@ -62,6 +62,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -101,6 +102,7 @@ ð0 { status = "okay"; + phy-handle = <&swphy4>; mtd-mac-address = <&uboot 0x1fc00>; @@ -109,6 +111,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts index fc5df53fa9..be1ebac41d 100644 --- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts +++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts @@ -11,10 +11,10 @@ model = "Buffalo BHR-4GRV2"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -24,7 +24,7 @@ leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "bhr-4grv2:green:power"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -68,6 +68,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi index 0f7838fd56..970a144dbc 100644 --- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi +++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi @@ -8,10 +8,10 @@ / { aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -21,7 +21,7 @@ leds: leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "iodata:green:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -94,6 +94,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -194,5 +195,6 @@ &wmac { status = "okay"; + qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts index 3bca23cc57..4828a5e0f5 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_devolo_dvl1xxx.dtsi" / { @@ -11,22 +8,22 @@ model = "devolo WiFi pro 1200e"; aliases { - led-boot = &status_blue; - led-failsafe = &status_red; - led-running = &status_blue; - led-upgrade = &status_red; + led-boot = &led_status_blue; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_red; }; leds { compatible = "gpio-leds"; - status_blue: status_blue { + led_status_blue: status_blue { label = "dvl1200e:blue:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - status_red: status_red { + led_status_red: status_red { label = "dvl1200e:red:status"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts index a844ce777c..61e6a665b9 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_devolo_dvl1xxx.dtsi" / { @@ -11,22 +8,22 @@ model = "devolo WiFi pro 1200i"; aliases { - led-boot = &status_blue; - led-failsafe = &status_red; - led-running = &status_blue; - led-upgrade = &status_red; + led-boot = &led_status_blue; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_red; }; leds { compatible = "gpio-leds"; - status_blue: status_blue { + led_status_blue: status_blue { label = "dvl1200i:blue:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - status_red: status_red { + led_status_red: status_red { label = "dvl1200i:red:status"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts index 567f3c9ee4..bd57f34e53 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_devolo_dvl1xxx.dtsi" / { @@ -11,22 +8,22 @@ model = "devolo WiFi pro 1750c"; aliases { - led-boot = &status_blue; - led-failsafe = &status_red; - led-running = &status_blue; - led-upgrade = &status_red; + led-boot = &led_status_blue; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_red; }; leds { compatible = "gpio-leds"; - status_blue: status_blue { + led_status_blue: status_blue { label = "dvl1750c:blue:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - status_red: status_red { + led_status_red: status_red { label = "dvl1750c:red:status"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts index 3d25004c40..9e50d9ffe8 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_devolo_dvl1xxx.dtsi" / { @@ -11,10 +8,10 @@ model = "devolo WiFi pro 1750e"; aliases { - led-boot = &status_blue; - led-failsafe = &status_red; - led-running = &status_blue; - led-upgrade = &status_red; + led-boot = &led_status_blue; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_red; }; keys { @@ -37,13 +34,13 @@ leds { compatible = "gpio-leds"; - status_blue: status_blue { + led_status_blue: status_blue { label = "dvl1750e:blue:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - status_red: status_red { + led_status_red: status_red { label = "dvl1750e:red:status"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts index e0bdd20937..c088a0b6f5 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_devolo_dvl1xxx.dtsi" / { @@ -11,22 +8,22 @@ model = "devolo WiFi pro 1750i"; aliases { - led-boot = &status_blue; - led-failsafe = &status_red; - led-running = &status_blue; - led-upgrade = &status_red; + led-boot = &led_status_blue; + led-failsafe = &led_status_red; + led-running = &led_status_blue; + led-upgrade = &led_status_red; }; leds { compatible = "gpio-leds"; - status_blue: status_blue { + led_status_blue: status_blue { label = "dvl1750i:blue:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - status_red: status_red { + led_status_red: status_red { label = "dvl1750i:red:status"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts index d0d678d0bf..2263292e44 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_devolo_dvl1xxx.dtsi" / { @@ -11,16 +8,16 @@ model = "devolo WiFi pro 1750x"; aliases { - led-boot = &status_red; - led-failsafe = &status_red; - led-running = &status_red; - led-upgrade = &status_red; + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_red; + led-upgrade = &led_status_red; }; leds { compatible = "gpio-leds"; - status_red: status_red { + led_status_red: status_red { /* This LED is not visible on the external casing. */ label = "dvl1750x:red:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi index cfd43c8e8a..ea752661ba 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi @@ -56,6 +56,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -138,12 +139,14 @@ ð1 { mtd-mac-address = <&art 0x00>; mtd-mac-address-increment = <1>; + phy-handle = <&phy1>; pll-data = <0x03000101 0x00000101 0x00001313>; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&art 0x00>; mtd-mac-address-increment = <(-2)>; diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts index 65be14ffd7..7953ed1325 100644 --- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts +++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &power_orange; - led-failsafe = &power_orange; - led-running = &power_orange; - led-upgrade = &power_orange; + led-boot = &led_power_orange; + led-failsafe = &led_power_orange; + led-running = &led_power_orange; + led-upgrade = &led_power_orange; }; leds { compatible = "gpio-leds"; - power_orange: power_orange { + led_power_orange: power_orange { label = "ecb1750:orange:power"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -69,6 +69,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts index 9545a85d62..72179f1da0 100644 --- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts +++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "epg5000:amber:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts index 4862083f70..8d3d5c58a6 100644 --- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts +++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "librerouter-v1:green:system"; gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; default-state = "on"; @@ -110,6 +110,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi index 6a7154f78c..170563b6a7 100644 --- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi +++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &power_green; - led-failsafe = &power_amber; - led-running = &power_green; - led-upgrade = &power_amber; + led-boot = &led_power_green; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_amber; label-mac-device = ð0; }; @@ -48,12 +48,12 @@ leds { compatible = "gpio-leds"; - power_green: power_green { + led_power_green: power_green { label = "netgear:green:power"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; }; - power_amber: power_amber { + led_power_amber: power_amber { label = "netgear:amber:power"; gpios = <&gpio 20 GPIO_ACTIVE_LOW>; }; @@ -135,6 +135,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts index b110929eac..5e3abdbbb8 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; @@ -43,7 +43,7 @@ linux,default-trigger = "phy0tpt"; }; - system: system { + led_system: system { label = "koala:blue:sys"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts index 05368bd7df..960d80eee2 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_tplink_archer-c7.dtsi" / { @@ -11,7 +8,7 @@ model = "TP-Link Archer C5 v1"; }; -&gpio_keys { +&keys { rfkill { gpios = <&gpio 23 GPIO_ACTIVE_LOW>; linux,code = <KEY_RFKILL>; @@ -20,7 +17,7 @@ }; }; -&gpio_leds { +&leds { wlan5g { label = "tp-link:green:wlan5g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; @@ -29,17 +26,20 @@ }; &mtdparts { - uboot: u-boot@0 { + uboot: partition@0 { + label = "u-boot"; reg = <0x000000 0x020000>; read-only; }; - firmware@20000 { + partition@20000 { + label = "firmware"; reg = <0x020000 0xfd0000>; compatible = "tplink,firmware"; }; - art: art@ff0000 { + art: partition@ff0000 { + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts index c26695d248..fda519439a 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_tplink_archer-c7.dtsi" / { @@ -11,7 +8,7 @@ model = "TP-Link Archer C7 v1"; }; -&gpio_keys { +&keys { rfkill { gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,code = <KEY_RFKILL>; @@ -20,7 +17,7 @@ }; }; -&gpio_leds { +&leds { wlan5g { label = "tp-link:green:wlan5g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; @@ -29,17 +26,20 @@ }; &mtdparts { - uboot: u-boot@0 { + uboot: partition@0 { + label = "u-boot"; reg = <0x000000 0x020000>; read-only; }; - firmware@20000 { + partition@20000 { + label = "firmware"; compatible = "tplink,firmware"; reg = <0x020000 0x7d0000>; }; - art: art@7f0000 { + art: partition@7f0000 { + label = "art"; reg = <0x7f0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts index afc1b14b8a..7cdfa56dfd 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - #include "qca9558_tplink_archer-c7.dtsi" / { @@ -11,7 +8,7 @@ model = "TP-Link Archer C7 v2"; }; -&gpio_keys { +&keys { rfkill { gpios = <&gpio 23 GPIO_ACTIVE_LOW>; linux,code = <KEY_RFKILL>; @@ -20,7 +17,7 @@ }; }; -&gpio_leds { +&leds { wlan5g { label = "tp-link:green:wlan5g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; @@ -29,17 +26,20 @@ }; &mtdparts { - uboot: u-boot@0 { + uboot: partition@0 { + label = "u-boot"; reg = <0x000000 0x020000>; read-only; }; - firmware@20000 { + partition@20000 { + label = "firmware"; reg = <0x020000 0xfd0000>; compatible = "tplink,firmware"; }; - art: art@ff0000 { + art: partition@ff0000 { + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi index c77613dad6..3defa554de 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi @@ -12,17 +12,17 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð1; }; - gpio_leds: leds { + leds: leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -42,7 +42,7 @@ linux,default-trigger = "usbport"; }; - led_wlan2g: wlan2g { + wlan2g { label = "tp-link:green:wlan2g"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; @@ -54,7 +54,7 @@ }; }; - gpio_keys: keys { + keys: keys { compatible = "gpio-keys"; reset { @@ -126,6 +126,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -188,6 +189,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index 056b513d7e..a78a9d5be1 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -11,10 +11,10 @@ compatible = "tplink,re350k-v1", "qca,qca9558"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; mdio-gpio0 = &mdio2; }; @@ -50,30 +50,30 @@ leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "tp-link:green:power"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; default-state = "on"; }; - wlan2g-green { + wlan2g_green { label = "tp-link:green:wlan2g"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; - wlan2g-red { + wlan2g_red { label = "tp-link:red:wlan2g"; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; }; - wlan5g-green { + wlan5g_green { label = "tp-link:green:wlan5g"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; - wlan5g-red { + wlan5g_red { label = "tp-link:red:wlan5g"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts index 77166b8bfe..f32e9ff125 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts @@ -22,7 +22,7 @@ label-mac-device = ð1; }; - gpio_leds: leds { + leds { compatible = "gpio-leds"; led_system: system { @@ -145,6 +145,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -225,6 +226,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <(-1)>; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi index 1092250f02..4c3a3230fe 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi @@ -12,17 +12,17 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = &wmac; }; leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts index 89887465dc..4bacf4723f 100644 --- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts +++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; }; leds { @@ -29,7 +29,7 @@ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - system: power_green { + led_power_green: power_green { label = "trendnet:green:power"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; }; @@ -112,6 +112,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -124,7 +125,7 @@ #address-cells = <1>; #size-cells = <1>; - uboot: partition@0 { + partition@0 { label = "u-boot"; reg = <0x000000 0x030000>; read-only; @@ -154,7 +155,7 @@ read-only; }; - mac: partition@fe0000 { + partition@fe0000 { label = "mac"; reg = <0xfe0000 0x010000>; read-only; @@ -209,5 +210,6 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 3e373928da..d81d9c54f5 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "nbg6716:white:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; @@ -119,6 +119,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts index 5a850c7064..2bb135eaff 100644 --- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts +++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts @@ -11,10 +11,10 @@ model = "AVM FRITZ!Box 4020"; aliases { - led-boot = &power; - led-failsafe = &info_red; - led-running = &power; - led-upgrade = &info_red; + led-boot = &led_power; + led-failsafe = &led_info_red; + led-running = &led_power; + led-upgrade = &led_info_red; }; chosen { @@ -50,7 +50,7 @@ leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "fritz4020:green:power"; gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -77,7 +77,7 @@ gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>; }; - info_red: info_red { + led_info_red: info_red { label = "fritz4020:red:info"; gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>; }; @@ -110,6 +110,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -169,5 +170,6 @@ &wmac { status = "okay"; + qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts index 794ac24ed8..351e37519d 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts @@ -14,6 +14,14 @@ bootargs = "console=ttyS0,115200n8"; }; + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + label-mac-device = ð0; + }; + led_spi { compatible = "spi-gpio"; #address-cells = <1>; @@ -50,18 +58,10 @@ }; }; - aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; - label-mac-device = ð0; - }; - leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "tp-link:green:power"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -118,6 +118,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -178,21 +179,24 @@ }; ð0 { + status = "okay"; + phy-mode = "mii"; phy-handle = <&swphy4>; - status = "okay"; mtd-mac-address = <&info 0x8>; }; ð1 { status = "okay"; + mtd-mac-address = <&info 0x8>; mtd-mac-address-increment = <1>; }; &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi index ddf92108b5..26cc9ec2e8 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi @@ -9,10 +9,10 @@ compatible = "tplink,archer-c5x", "qca,qca9560"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = ð1; }; @@ -43,7 +43,7 @@ leds: leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "tp-link:green:power"; gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index 3c974e0109..21a470961f 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = ð0; }; @@ -38,7 +38,7 @@ leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "tp-link:green:power"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts index 971c567924..4df4e8a969 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts @@ -8,10 +8,10 @@ model = "D-Link DIR-842 C1"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { @@ -22,7 +22,7 @@ gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; - power: power { + led_power: power { label = "dir-842-c1:green:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts index 9d70dd9be7..b86ea29a99 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts @@ -8,10 +8,10 @@ model = "D-Link DIR-842 C2"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { @@ -22,7 +22,7 @@ gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; - power: power { + led_power: power { label = "dir-842-c2:green:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts index 2a15176a8a..205fd8f60e 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts @@ -8,10 +8,10 @@ model = "D-Link DIR-842 C3"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds { @@ -22,7 +22,7 @@ gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; - power: power { + led_power: power { label = "dir-842-c3:green:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts index a17d9f263a..9fe5cb0af9 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts @@ -11,10 +11,10 @@ compatible = "dlink,dir-859-a1", "qca,qca9563"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -29,7 +29,7 @@ gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; - power: power { + led_power: power { label = "dir-859-a1:green:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; @@ -87,10 +87,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; @@ -173,5 +173,6 @@ &wmac { status = "okay"; + qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts index 978fa6af57..0152f62cd8 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts @@ -12,7 +12,7 @@ }; &leds { - power: power { + led_power: power { label = "elecom:blue:power"; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; default-state = "on"; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts index 778e0fd52e..7ebd15342c 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts @@ -12,7 +12,7 @@ }; &leds { - power: power { + led_power: power { label = "elecom:white:power"; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; default-state = "on"; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi index 2f5c2c4aac..028c1747d2 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi @@ -12,10 +12,10 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; leds: leds { diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts index dc3ea24ae6..3f9a091824 100644 --- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts +++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -44,7 +44,7 @@ leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "gl-ar750s:green:power"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "keep"; @@ -86,6 +86,7 @@ &spi { status = "okay"; + num-cs = <0>; flash@0 { @@ -151,6 +152,7 @@ &mdio0 { status = "okay"; + phy-mask = <0>; phy0: ethernet-phy@0 { @@ -172,5 +174,6 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts index 8c356bd754..68b10647b9 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts @@ -15,23 +15,23 @@ }; aliases { - led-boot = &power_green; - led-failsafe = &power_red; - led-running = &power_green; - led-upgrade = &power_green; + led-boot = &led_power_green; + led-failsafe = &led_power_red; + led-running = &led_power_green; + led-upgrade = &led_power_green; }; leds { compatible = "gpio-leds"; /* other LEDs are connected to ath10k (QCA9888) gpiochip */ - power_green: power_green { + led_power_green: power_green { label = "wg1200cr:green:power"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; default-state = "on"; }; - power_red: power_red { + led_power_red: power_red { label = "wg1200cr:red:power"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; @@ -74,6 +74,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -172,5 +173,6 @@ &wmac { status = "okay"; + qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts index 9cba99b6a6..2efedcffec 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &power_green; - led-failsafe = &power_red; - led-running = &power_green; - led-upgrade = &power_green; + led-boot = &led_power_green; + led-failsafe = &led_power_red; + led-running = &led_power_green; + led-upgrade = &led_power_green; }; leds { @@ -41,12 +41,12 @@ gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; - power_red: power_red { + led_power_red: power_red { label = "wg800hp:red:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - power_green: power_green { + led_power_green: power_green { label = "wg800hp:green:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts index faa8105e8c..028324410f 100644 --- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts +++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; - gpio_leds: leds { + leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "wr818:red:system"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; @@ -57,10 +57,10 @@ }; &spi { - num-cs = <1>; - status = "okay"; + num-cs = <1>; + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; @@ -129,6 +129,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts index 42db1d7a24..db6e5fb7f3 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts @@ -8,7 +8,7 @@ model = "TP-Link Archer A7 v5"; }; -&gpio_keys { +&keys { reset { label = "Reset button"; linux,code = <KEY_RESTART>; @@ -18,31 +18,31 @@ }; &mtdparts { - factory-uboot@0 { + partition@0 { label = "factory-uboot"; reg = <0x000000 0x020000>; read-only; }; - uboot: u-boot@20000 { + uboot: partition@20000 { label = "u-boot"; reg = <0x020000 0x020000>; read-only; }; - firmware@40000 { + partition@40000 { label = "firmware"; reg = <0x040000 0xec0000>; compatible = "denx,uimage"; }; - info: info@f40000 { + info: partition@f40000 { label = "info"; reg = <0xf40000 0x020000>; read-only; }; - config: config@f60000 { + config: partition@f60000 { label = "config"; reg = <0xf60000 0x050000>; read-only; @@ -54,7 +54,7 @@ read-only; }; - art: art@ff0000 { + art: partition@ff0000 { label = "art"; reg = <0xff0000 0x010000>; read-only; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts index 782a581aca..7852bed1f3 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts @@ -15,16 +15,16 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; - gpio_leds: leds { + leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -103,6 +103,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -182,6 +183,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts index 470a8e6bf9..dcdd7bcf3c 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts @@ -15,10 +15,10 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; @@ -61,7 +61,7 @@ leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -192,6 +192,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -267,6 +268,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts index efe83cd5ee..7e735adbd3 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts @@ -8,7 +8,7 @@ model = "TP-Link Archer C7 v5"; }; -&gpio_keys { +&keys { reset { label = "Reset button"; linux,code = <KEY_RESTART>; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi index 2ed5e0ceb4..f1a1f5673d 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi @@ -12,17 +12,17 @@ }; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; label-mac-device = ð0; }; leds { compatible = "gpio-leds"; - power: power { + led_power: power { label = "tp-link:green:power"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -94,6 +94,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi index 2e66e0f03e..3049c8bc20 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi @@ -12,17 +12,17 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = ð0; }; - gpio_leds: leds { + leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -41,7 +41,7 @@ linux,default-trigger = "phy0tpt"; }; - led_wlan2g: wlan2g { + wlan2g { label = "tp-link:green:wlan2g"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; @@ -83,7 +83,7 @@ }; }; - gpio_keys: keys { + keys: keys { compatible = "gpio-keys"; wps { @@ -134,6 +134,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -182,6 +183,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts index 36e5ef81db..464be73449 100644 --- a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts @@ -15,17 +15,17 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; mdio-gpio0 = &mdio2; }; leds { compatible = "gpio-leds"; - system: power { + led_power: power { label = "tp-link:blue:power"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi index d21bee6970..ba56cf23b8 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi @@ -12,17 +12,17 @@ }; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; label-mac-device = &wmac; }; - gpio_leds: leds { + leds: leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:green:system"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; linux,default-trigger = "heartbeat"; @@ -123,6 +123,7 @@ &wmac { status = "okay"; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts index 07a7409886..9e220539db 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts @@ -21,6 +21,7 @@ &spi { status = "okay"; + num-cs = <1>; flash@0 { @@ -78,7 +79,7 @@ }; }; -&gpio_leds { +&leds { usb { label = "tp-link:green:usb"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi index 5027dc3c47..f5543e4f89 100644 --- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi +++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi @@ -5,16 +5,16 @@ / { aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:blue:system"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts index a8dff14b8f..54e3555306 100644 --- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts +++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts @@ -8,16 +8,16 @@ model = "TP-Link TL-WR940N v4"; aliases { - led-boot = &system; - led-failsafe = &system; - led-running = &system; - led-upgrade = &system; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; leds { compatible = "gpio-leds"; - system: system { + led_system: system { label = "tp-link:blue:system"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; default-state = "on"; |