ramips: move redundant console setup to mt7621 SoC DTSI
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 14 Jul 2020 10:01:51 +0000 (12:01 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 17 Jul 2020 10:14:32 +0000 (12:14 +0200)
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 <freifunk@adrianschmutzler.de>
47 files changed:
target/linux/ramips/dts/mt7621.dtsi
target/linux/ramips/dts/mt7621_adslr_g7.dts
target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts
target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi
target/linux/ramips/dts/mt7621_edimax_re23s.dts
target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi
target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
target/linux/ramips/dts/mt7621_firefly_firewrt.dts
target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts
target/linux/ramips/dts/mt7621_iptime_a8004t.dts
target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts
target/linux/ramips/dts/mt7621_linksys_re6500.dts
target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
target/linux/ramips/dts/mt7621_mqmaker_witi.dts
target/linux/ramips/dts/mt7621_mtc_wr1201.dts
target/linux/ramips/dts/mt7621_netgear_ex6150.dts
target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi
target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
target/linux/ramips/dts/mt7621_netgear_wac104.dts
target/linux/ramips/dts/mt7621_netis_wf2881.dts
target/linux/ramips/dts/mt7621_phicomm_k2p.dts
target/linux/ramips/dts/mt7621_planex_vr500.dts
target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
target/linux/ramips/dts/mt7621_totolink_a7000r.dts
target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi
target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi
target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
target/linux/ramips/dts/mt7621_zyxel_wap6805.dts

index 78979dc4206b1907f7f81618a0f7305e65577503..61727848698e259a67bcfaafd37d471a5c9f0909 100644 (file)
                serial0 = &uartlite;
        };
 
+       chosen {
+               bootargs = "console=ttyS0,57600";
+       };
+
        pll: pll {
                compatible = "mediatek,mt7621-pll", "syscon";
 
index aa3f423f9b90657d0d9b815b6dc1f8e2f395ac12..b6af1155c529e10aa586a9ede4f0f864e88c93ad 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 2384fadbee850370b40fbb60331afa9c173e14bb..661c7d89de9ae69451a527b28bec5f56ad872617 100644 (file)
                led-upgrade = &led_run;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index bd6642fe51499bf2619de4ba033622231df53428..bc54d14083bbcde762b2158fb8ea08a3ec07a578 100644 (file)
@@ -6,10 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index 0b37dc839529922aa0c6ce51705d3b43652c0902..aba7ceda510ecdc5c61b56a354464f7b07c222e5 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 7ad6727f5133c23a3fc38ff42efc245238d8f0e0..0921a477e926a015cfb00974cf0c2f19a1861bdf 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index bb430f2120617b42eafcc10400edcb50d60d1cec..9c82327e34053a87f4af3210ff05763cf2339a5a 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index e17c66689a5e1260a3f8746177a4b9d968dc4668..570a8d8c2b2768549b09a5b9a5b3bb3993b00152 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 6aaa1875d62e6a5bacf0b0b13e6652e60f008dcc..eb42edc95281fd00413d2921987d569812719346 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index ce747deb287107a1ff8d4d0f7aef1c0fca6318c6..4aba6b9582c59a6831729d5a3989d9ae8e0f94fd 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index f2f0a4c56f68905b574dd2ccee7c931e037dd65a..9320967e715e5601b5b4d423d0d44ca49aacd6b6 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index 79733152f054103a7d00f9900e33ad635e87ff9b..a650ee3c2102ae847265acf2f22240e0466425ef 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index b52ead09d3c1371ed2789a14f2d3524b340952b0..f93ae1be04e99d2675eb786d3ee4ccfac5fb8c98 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index a455918d7a9d0199de00e030bc7e62d4cd7191d9..3b127e922399da501e32a7075c7a4f707e175188 100644 (file)
                led-upgrade = &led_power_green;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index c28ba7d973ebaf37f458df87f29d0099a2f71ab7..d4d2fa99e12edf042e009cbc83741fc2b82ce734 100644 (file)
                label-mac-device = &wan;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index c7c2f5afbdd03b33758e44d463e9fdc58d205a64..e821a3d1d95af2378b32f0beaffa786cbe66e4f8 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 8f7e273b10c44cbfeb9c90d32d2d65c399962dc8..d12ee92b10fda4030e172b135737bf4246b36f94 100644 (file)
        compatible = "gehua,ghl-r-001", "mediatek,mt7621-soc";
        model = "GeHua GHL-R-001";
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index e33838a8b93e47d209e1807b57d76200dd4779e5..364a6bc69d2d6435b8a932bbcf33eb944173eb3c 100644 (file)
                led-upgrade = &led_status;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index 8d5286be415a837ccfd5addfff28c64129ab63b9..7b9cb1751fc7b71eba939cb916f6efb4d344a806 100644 (file)
                led-upgrade = &led_status;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index acef4d22a0938f4ef201b8c7761bfeb865007da9..1ed9380b37331730ffeab193f0319c2d678a2ae8 100644 (file)
                label-mac-device = &wan;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 94b0c18d45e1d96d5ce668fbdbd63f47114b99cd..b7f6400930bfe456a063d6c4a054b4cd362433bb 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index be8b101b78664003241c290ce6010271d752e4f1..9b5ed5412c914f86478501529883d6b79daf9bf9 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index e96a5d660e66800bd0227ac5b864c94e1f7381b5..eb437b55285b1c3b15dc63d82f3b146338dc6512 100644 (file)
        compatible = "iptime,a8004t", "mediatek,mt7621-soc";
        model = "ipTIME A8004T";
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        aliases {
                led-boot = &led_cpu;
                led-failsafe = &led_cpu;
index 126896c9066c514bd23387663fb945e8df568108..cdf71017cea6303f313b6310d7624b5bd98c12db 100644 (file)
                label-mac-device = &wan;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index ea900d36c2290354b8d3cf3c3a794f32b6f4c788..3cdb1ce7f9141f6ff14ac3235e80b488dfaa1e61 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index b202342343e347fb01eea87b7718e60c92da883f..e6600ad02869bf2e558565af8eb8c7d8de23c50b 100644 (file)
@@ -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";
index 8321caae6e132aa9570e95020a25860d510e75cb..c41cba0e97ab14b7c99e86a222c2463e07ba2d0d 100644 (file)
@@ -5,10 +5,6 @@
 / {
        compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "Mediatek MT7621 evaluation board";
-
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
 };
 
 &nand {
index d871ef02316bc223d360e54ebfd7b62b72f634a5..169a69e4a670b4fe9ed1bea72158aff9b0aa2e88 100644 (file)
@@ -9,10 +9,6 @@
        compatible = "mqmaker,witi", "mediatek,mt7621-soc";
        model = "MQmaker WiTi";
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index 66b4f92852f38294f821b1bbd35538241b4c08aa..15e7552e5e29829125757d1292fbc6552ff2ab8d 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 1b0b9e29e95884d4bfb2eef078c1dbf6d79e8f34..41c18b4c3b3138df3da675daecd583d0082325e2 100644 (file)
                led-upgrade = &power_amber;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 0b9e7c6626dbcc622a6e1d7b781ccd4e49b48df3..9313b4c38eddc987ec48ec0692f82f29d2fc2035 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index d2e5502e4872330ecf99b09bc62f2be20e27ba7c..eee6c535e1363df7c9ed4a93fed02bbcf98f4c8f 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index b781edf6beaebe89f5cac5042a628156e4d40a35..0de2167e0a9475a39089b30c17769443a32c525a 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index e6746c999bc1f03320d3247ae02aa148635398f6..ec6fe34953236f5fd541824bc771898f54becde2 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index e937134ae9bbffdfe70801e6caeef69cd15664fa..cd49f0a6b325ff790f20e67858d6e4d81d96738e 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index aa68dddcfc83a322cac9f4e58a9698440ba19f11..5a04fb225cb9a94afd229a3e30446a0b255ba4c6 100644 (file)
                led-upgrade = &led_blue;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 4471c4c4e284d59b1bcf5bf5f60944abe8b41ddd..15cf191c5af252b72681c4b597e4e68d4aafbd3b 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index a237298ec66568c6de7cfa73b4725feff2ff9a98..2b8f89b87649e30e5d5f0dcb8c15ca0a65e07d8d 100644 (file)
                led-upgrade = &led_wps;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index a8e6f51ef1d30c5747e9c3f7faa9607e7369bc65..be6e7ec89d93c518c33a359d42c85a881c43b69a 100644 (file)
@@ -9,10 +9,6 @@
        compatible = "storylink,sap-g3200u3", "mediatek,mt7621-soc";
        model = "STORYLiNK SAP-G3200U3";
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index fd24d40fe18740eb0333c44efda38c17248e3299..93de34489b7d7904326334a8d2360ef2a700ca27 100644 (file)
                led-upgrade = &led_sys;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index e11d2b4de1c8b63b99bc798388deb29c5a6f86d2..665af89dfed0a9b761ae01644aa82a35e3c33910 100644 (file)
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index fa9d16a55a48d9eeb81452851b1466c81fbf8ccf..7e860cb00e90a31073c14f18e7513bb09b699eb5 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index 046b9bb197f0d0d6886de9d54c42f9cb0c91cc95..04eb49bfa359fa5feaf1280466de924ac6fb1f0b 100644 (file)
@@ -8,10 +8,6 @@
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index 95923632602bde0dedc79edffb824a398639c779..ffa86a4810b322cf63f479e287f7f78276d8a5ae 100644 (file)
@@ -8,10 +8,6 @@
                label-mac-device = &wan;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
index d19a3440b57696587abb613b4a40044155a3fae7..8241517c73be200a14dc99be2db01a68fb54ce9a 100644 (file)
@@ -6,7 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-
        chosen {
                bootargs = "console=ttyS0,115200n8";
        };
index d99cc7d2578e4e6c99b99de1763e4ddd9af58522..5eacdfaaed78cebfe7625544bf39c51c2047d122 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
index 8152ca11f88c3146fff44066711f895109d6cd0e..aa167df4efd950648d96daa0057a6a913c937a3f 100644 (file)
                label-mac-device = &gmac0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";