ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ath79: drop and consolidate redundant chosen/bootargs

Browse Source 
In ath79, for several SoCs the console bootargs are defined to the
very same value in every device's DTS. Consolidate these definitions
in the SoC dtsi files and drop further redundant definitions elsewhere.

The only device without any bootargs set has been OpenMesh OM5P-AC V2.
This will now inherit the setting from qca955x.dtsi

While this is a cosmetic change, backporting it to 19.07 will be a
major help for anyone doing backports of device support. Without it,
every backporter would have to remember to manually add the chosen node
to the device's DTS.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit 635f111148)
This commit is contained in:
Adrian Schmutzler 2020-06-25 23:09:05 +02:00
parent 153392e209
commit b40e6bc55f
50 changed files with 12 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ath79/dts/ar7100.dtsi
View File

@ -5,6 +5,10 @@
/ {
compatible = "qca,ar7100";
chosen {
bootargs = "console=ttyS0,115200";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;

4
target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts
View File

@ -16,10 +16,6 @@
led-upgrade = &diag;
};
chosen {
bootargs = "console=ttyS0,115200";
};
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;

4
target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &orange_power;
};
chosen {
bootargs = "console=ttyS0,115200";
};
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;

4
target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
View File

@ -14,10 +14,6 @@
led-upgrade = &power_orange;
};
chosen {
bootargs = "console=ttyS0,115200";
};
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;

4
target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
View File

@ -7,10 +7,6 @@
#include "ar7100.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200";
};
aliases {
led-boot = &rf;
led-failsafe = &rf;

4
target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
View File

@ -7,10 +7,6 @@
#include "ar9344.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200";
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-d50-v1", "qca,qca9531";
model = "TP-Link Archer D50 v1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
gpio_leds: leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9531_yuncore_a770.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &status;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
View File

@ -7,10 +7,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_link4;
led-failsafe = &led_link4;

4
target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
View File

@ -13,10 +13,6 @@
led-upgrade = &led_system;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
View File

@ -6,10 +6,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

4
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
View File

@ -7,10 +7,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
gpio_leds: leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
View File

@ -7,10 +7,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

4
target/linux/ath79/dts/qca9557.dtsi
View File

@ -8,6 +8,10 @@
#address-cells = <1>;
#size-cells = <1>;
chosen {
bootargs = "console=ttyS0,115200n8";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;

4
target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &power;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
View File

@ -14,10 +14,6 @@
led-upgrade = &power;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds: leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
View File

@ -18,10 +18,6 @@
#include "qca9557.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
View File

@ -10,10 +10,6 @@
compatible = "engenius,ecb1750", "qca,qca9557";
model = "EnGenius ECB1750";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power_orange;
led-failsafe = &power_orange;

4
target/linux/ath79/dts/qca9558_engenius_epg5000.dts
View File

@ -10,10 +10,6 @@
model = "EnGenius EPG5000";
compatible = "engenius,epg5000", "qca,qca9557";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power;
led-failsafe = &power;

4
target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
View File

@ -10,10 +10,6 @@
compatible = "librerouter,librerouter-v1", "qca,qca9558";
model = "LibreRouter v1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
View File

@ -7,10 +7,6 @@
#include "qca9557.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power_green;
led-failsafe = &power_amber;

4
target/linux/ath79/dts/qca9558_ocedo_koala.dts
View File

@ -10,10 +10,6 @@
compatible = "ocedo,koala", "qca,qca9557";
model = "OCEDO Koala";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9558_ocedo_ursus.dts
View File

@ -10,10 +10,6 @@
compatible = "ocedo,ursus", "qca,qca9558";
model = "OCEDO Ursus";
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
View File

@ -7,10 +7,6 @@
#include "qca9557.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
View File

@ -18,10 +18,6 @@
mdio-gpio0 = &mdio2;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,tl-wdr4900-v2", "qca,qca9558";
model = "TP-Link TL-WDR4900 v2";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

4
target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
View File

@ -7,10 +7,6 @@
#include "qca9557.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,tl-wr941n-v7-cn", "qca,qca9558";
model = "TP-Link TL-WR941N v7 (CN)";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

4
target/linux/ath79/dts/qca9561_avm_fritz4020.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &info_red;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
led_spi {
compatible = "spi-gpio";
#address-cells = <1>;

4
target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c25-v1", "qca,qca9561";
model = "TP-Link Archer C25 v1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
led_spi {
compatible = "spi-gpio";
#address-cells = <1>;

4
target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
View File

@ -8,10 +8,6 @@
/ {
compatible = "tplink,archer-c5x", "qca,qca9560";
chosen {
bootargs = "console=ttyS0,115200n8";
};
led_spi {
compatible = "spi-gpio";
#address-cells = <1>;

4
target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

4
target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &led_red;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys-polled";
poll-interval = <100>;

4
target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &power;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
View File

@ -7,10 +7,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power;
led-failsafe = &power;

4
target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
View File

@ -10,10 +10,6 @@
compatible = "glinet,gl-ar750s", "qca,qca9563";
model = "GL.iNet GL-AR750S";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power;
led-failsafe = &power;

4
target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
View File

@ -10,10 +10,6 @@
model = "NEC Aterm WG1200CR";
compatible = "nec,wg1200cr", "qca,qca9563";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power_green;
led-failsafe = &power_red;

4
target/linux/ath79/dts/qca9563_nec_wg800hp.dts
View File

@ -10,10 +10,6 @@
model = "NEC Aterm WG800HP";
compatible = "nec,wg800hp", "qca,qca9563";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power_green;
led-failsafe = &power_red;

4
target/linux/ath79/dts/qca9563_phicomm_k2t.dts
View File

@ -17,10 +17,6 @@
led-upgrade = &status_red;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9563_rosinson_wr818.dts
View File

@ -10,10 +10,6 @@
model = "ROSINSON WR818";
compatible = "rosinson,wr818", "qca,qca9563";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c2-v3", "qca,qca9563";
model = "TP-Link Archer C2 v3";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c7-v4", "qca,qca9563";
model = "TP-Link Archer C7 v4";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
View File

@ -7,10 +7,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &power;
led-failsafe = &power;

4
target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
View File

@ -7,10 +7,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
View File

@ -10,10 +10,6 @@
compatible = "tplink,re450-v2", "qca,qca9563";
model = "TP-Link RE450 v2";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
View File

@ -7,10 +7,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &system;
led-failsafe = &system;

4
target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
View File

@ -13,10 +13,6 @@
led-upgrade = &led_blue;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

4
target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
View File

@ -7,10 +7,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/qca956x.dtsi
View File

@ -8,6 +8,10 @@
#address-cells = <1>;
#size-cells = <1>;
chosen {
bootargs = "console=ttyS0,115200n8";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;

6
target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
View File

@ -5,12 +5,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
};
&spi {
status = "okay";