ath79: drop and consolidate redundant chosen/bootargs

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

Note that while this tidies up master a lot, it might develop into a
frequent pitfall for backports.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-06-25 23:09:05 +02:00
parent 54b19e213a
commit 635f111148
68 changed files with 12 additions and 262 deletions

View File

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

View File

@ -12,10 +12,6 @@
led-running = &led_user; led-running = &led_user;
}; };
chosen {
bootargs = "console=ttyS0,115200";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";

View File

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

View File

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

View File

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

View File

@ -10,10 +10,6 @@
compatible = "siemens,ws-ap3610", "qca,ar7161"; compatible = "siemens,ws-ap3610", "qca,ar7161";
model = "Siemens WS-AP3610"; model = "Siemens WS-AP3610";
chosen {
bootargs = "console=ttyS0,115200";
};
aliases { aliases {
led-boot = &led_power_green; led-boot = &led_power_green;
led-failsafe = &led_power_red; led-failsafe = &led_power_red;

View File

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

View File

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

View File

@ -18,10 +18,6 @@
label-mac-device = &wmac; label-mac-device = &wmac;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";

View File

@ -18,10 +18,6 @@
label-mac-device = &wmac; label-mac-device = &wmac;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";

View File

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

View File

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

View File

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

View File

@ -18,10 +18,6 @@
label-mac-device = &wmac; label-mac-device = &wmac;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";

View File

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

View File

@ -6,10 +6,6 @@
#include "qca953x.dtsi" #include "qca953x.dtsi"
/ { / {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
label-mac-device = &wmac; label-mac-device = &wmac;
}; };

View File

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

View File

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

View File

@ -15,10 +15,6 @@
serial0 = &uart; serial0 = &uart;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";

View File

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

View File

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

View File

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

View File

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

View File

@ -10,10 +10,6 @@
compatible = "dlink,dap-2695-a1", "qca,qca9558"; compatible = "dlink,dap-2695-a1", "qca,qca9558";
model = "D-link DAP-2695-A1"; model = "D-link DAP-2695-A1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
led-boot = &led_power_red; led-boot = &led_power_red;
led-failsafe = &led_power_red; led-failsafe = &led_power_red;

View File

@ -10,10 +10,6 @@
compatible = "domywifi,dw33d", "qca,qca9558"; compatible = "domywifi,dw33d", "qca,qca9558";
model = "DomyWifi DW33D"; model = "DomyWifi DW33D";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
led-boot = &led_system; led-boot = &led_system;
led-failsafe = &led_system; led-failsafe = &led_system;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -10,10 +10,6 @@
model = "Sitecom WLR-8100 (X8 AC1750)"; model = "Sitecom WLR-8100 (X8 AC1750)";
compatible = "sitecom,wlr-8100", "qca,qca9558"; compatible = "sitecom,wlr-8100", "qca,qca9558";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
led-boot = &led_status_amber; led-boot = &led_status_amber;
led-failsafe = &led_status_amber; led-failsafe = &led_status_amber;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -10,10 +10,6 @@
compatible = "trendnet,tew-823dru", "qca,qca9558"; compatible = "trendnet,tew-823dru", "qca,qca9558";
model = "TRENDNET TEW-823DRU"; model = "TRENDNET TEW-823DRU";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
led-boot = &led_power_green; led-boot = &led_power_green;
led-failsafe = &led_power_green; led-failsafe = &led_power_green;

View File

@ -10,10 +10,6 @@
compatible = "zyxel,nbg6716", "qca,qca9558"; compatible = "zyxel,nbg6716", "qca,qca9558";
model = "ZyXEL NBG6716"; model = "ZyXEL NBG6716";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
led-boot = &led_power; led-boot = &led_power;
led-failsafe = &led_power; led-failsafe = &led_power;

View File

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

View File

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

View File

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

View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c25-v1", "qca,qca9561"; compatible = "tplink,archer-c25-v1", "qca,qca9561";
model = "TP-Link Archer C25 v1"; model = "TP-Link Archer C25 v1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases { aliases {
led-boot = &led_power; led-boot = &led_power;
led-failsafe = &led_power; led-failsafe = &led_power;

View File

@ -16,10 +16,6 @@
label-mac-device = &eth1; label-mac-device = &eth1;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
led_spi { led_spi {
compatible = "spi-gpio"; compatible = "spi-gpio";
#address-cells = <1>; #address-cells = <1>;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -9,10 +9,6 @@
aliases { aliases {
label-mac-device = &eth0; label-mac-device = &eth0;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
}; };
&pcie { &pcie {

View File

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

View File

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

View File

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

View File

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

View File

@ -10,10 +10,6 @@
label-mac-device = &eth0; label-mac-device = &eth0;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";

View File

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

View File

@ -9,10 +9,6 @@
aliases { aliases {
label-mac-device = &wmac; label-mac-device = &wmac;
}; };
chosen {
bootargs = "console=ttyS0,115200n8";
};
}; };
&spi { &spi {