From: Adrian Schmutzler Date: Sat, 22 Feb 2020 18:33:41 +0000 (+0100) Subject: ramips: move includes to DTSI for mt7628an_tplink_8m* X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1173719817796415acafa1c9dc09384e8808aa64;p=openwrt%2Fstaging%2Fjogo.git ramips: move includes to DTSI for mt7628an_tplink_8m* All devices inherited from mt7628an_tplink_8m.dtsi and mt7628an_tplink_8m-split-uboot.dtsi contain the same additional includes in the DTS files. Move them to the DTSI files instead. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi index 2229060347..157136bd09 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi @@ -1,6 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "mt7628an.dtsi" +#include +#include + / { chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi index 5269fd668b..666ff49a90 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi @@ -1,5 +1,8 @@ #include "mt7628an.dtsi" +#include +#include + / { chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index 3f02b7af3c..9d0f6563c3 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,archer-c20-v4", "mediatek,mt7628an-soc"; model = "TP-Link Archer C20 v4"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts index e01826841d..9aca8429b4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts @@ -3,9 +3,6 @@ #include "mt7628an_tplink_8m-split-uboot.dtsi" -#include -#include - / { compatible = "tplink,archer-c20-v5", "mediatek,mt7628an-soc"; model = "TP-Link Archer C20 v5"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index 92f581d1ef..360466d56f 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,archer-c50-v3", "mediatek,mt7628an-soc"; model = "TP-Link Archer C50 v3"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts index f7a559918c..8db4f21987 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts @@ -3,9 +3,6 @@ #include "mt7628an_tplink_8m-split-uboot.dtsi" -#include -#include - / { compatible = "tplink,archer-c50-v4", "mediatek,mt7628an-soc"; model = "TP-Link Archer C50 v4"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index 76cf0ca249..ad60548678 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-mr3420-v5", "mediatek,mt7628an-soc"; model = "TP-Link TL-MR3420 v5"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index 7b9033202c..5485a04119 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-wa801nd-v5", "mediatek,mt7628an-soc"; model = "TP-Link TL-WA801ND v5"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index 3c615e6061..25444b1d3d 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -3,9 +3,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-wr802n-v4", "mediatek,mt7628an-soc"; model = "TP-Link TL-WR802N v4"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index 3f901d3a7c..5d7035bba4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-wr840n-v4", "mediatek,mt7628an-soc"; model = "TP-Link TL-WR840N v4"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index 89e2923c9c..ca25ce643d 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-wr841n-v13", "mediatek,mt7628an-soc"; model = "TP-Link TL-WR841N v13"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index a0adb160d3..50974fafe7 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-wr842n-v5", "mediatek,mt7628an-soc"; model = "TP-Link TL-WR842N v5"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts index f4b50a37ff..9d5dddbe4b 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -2,9 +2,6 @@ #include "mt7628an_tplink_8m.dtsi" -#include -#include - / { compatible = "tplink,tl-wr902ac-v3", "mediatek,mt7628an-soc"; model = "TP-Link TL-WR902AC v3";