ramips: move redundant console setup to mt7621 SoC DTSI

For mt7621, console is set up via DTS bootargs individually in
device DTS/DTSI files. However, 44 of 74 statements use the
following setting:

	chosen {
		bootargs = "console=ttyS0,57600";
	};

Therefore, don't repeat ourselves and move that definition to the SoC
DTSI file to serve as a default value.

This patch is cosmetic.

Signed-off-by: Adrian Schmutzler <[email protected]>

target/linux/ramips/dts/mt7621.dtsi

@@ -35,6 +35,10 @@
 		serial0 = &uartlite;
 	};
 
+	chosen {
+		bootargs = "console=ttyS0,57600";
+	};
+
 	pll: pll {
 		compatible = "mediatek,mt7621-pll", "syscon";
 

target/linux/ramips/dts/mt7621_adslr_g7.dts

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

target/linux/ramips/dts/mt7621_afoundry_ew1200.dts

@@ -16,10 +16,6 @@
 		led-upgrade = &led_run;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi

@@ -6,10 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts

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

target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi

@@ -13,10 +13,6 @@
 		led-upgrade = &led_power;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts

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

target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts

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

target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts

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

target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts

@@ -17,10 +17,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi

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

target/linux/ramips/dts/mt7621_edimax_re23s.dts

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

target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi

@@ -11,10 +11,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts

@@ -16,10 +16,6 @@
 		led-upgrade = &led_power_green;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi

@@ -14,10 +14,6 @@
 		label-mac-device = &wan;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_firefly_firewrt.dts

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

target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts

@@ -10,10 +10,6 @@
 	compatible = "gehua,ghl-r-001", "mediatek,mt7621-soc";
 	model = "GeHua GHL-R-001";
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts

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

target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts

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

target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi

@@ -14,10 +14,6 @@
 		label-mac-device = &wan;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts

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

target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts

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

target/linux/ramips/dts/mt7621_iptime_a8004t.dts

@@ -10,10 +10,6 @@
 	compatible = "iptime,a8004t", "mediatek,mt7621-soc";
 	model = "ipTIME A8004T";
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	aliases {
 		led-boot = &led_cpu;
 		led-failsafe = &led_cpu;

target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts

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

target/linux/ramips/dts/mt7621_linksys_re6500.dts

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

target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts

@@ -6,10 +6,6 @@
 	compatible = "mediatek,ap-mt7621a-v60", "mediatek,mt7621-soc";
 	model = "Mediatek AP-MT7621A-V60 EVB";
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	sound {
 		compatible = "simple-audio-card";
 		simple-audio-card,name = "Audio-I2S";

target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts

@@ -5,10 +5,6 @@
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Mediatek MT7621 evaluation board";
-
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
 };
 
 &nand {

target/linux/ramips/dts/mt7621_mqmaker_witi.dts

@@ -9,10 +9,6 @@
 	compatible = "mqmaker,witi", "mediatek,mt7621-soc";
 	model = "MQmaker WiTi";
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_mtc_wr1201.dts

@@ -17,10 +17,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_netgear_ex6150.dts

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

target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi

@@ -16,10 +16,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi

@@ -12,10 +12,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi

@@ -16,10 +16,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_netgear_wac104.dts

@@ -18,10 +18,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_netis_wf2881.dts

@@ -17,10 +17,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_phicomm_k2p.dts

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

target/linux/ramips/dts/mt7621_planex_vr500.dts

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

target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts

@@ -15,10 +15,6 @@
 		led-upgrade = &led_wps;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts

@@ -9,10 +9,6 @@
 	compatible = "storylink,sap-g3200u3", "mediatek,mt7621-soc";
 	model = "STORYLiNK SAP-G3200U3";
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_totolink_a7000r.dts

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

target/linux/ramips/dts/mt7621_tplink_re350-v1.dts

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

target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi

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

target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi

@@ -8,10 +8,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi

@@ -8,10 +8,6 @@
 		label-mac-device = &wan;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	keys {
 		compatible = "gpio-keys";
 

target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi

@@ -6,7 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-
 	chosen {
 		bootargs = "console=ttyS0,115200n8";
 	};

target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts

@@ -17,10 +17,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 

target/linux/ramips/dts/mt7621_zyxel_wap6805.dts

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