From: Mathias Kresin Date: Sat, 8 Apr 2017 09:40:07 +0000 (+0200) Subject: lantiq: remove the former board name from device tree model X-Git-Tag: v18.06.0-rc1~1523 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=26dc65b126dfa6b63a9df725069bf331a3e8577a lantiq: remove the former board name from device tree model Remove the former used board name from the device model property and use the model name as it is. Signed-off-by: Mathias Kresin --- diff --git a/target/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh b/target/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh index bbbac97bae..a40185ad3c 100755 --- a/target/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh +++ b/target/linux/lantiq/base-files/lib/preinit/01_preinit_board.sh @@ -2,7 +2,7 @@ lantiq_board_detect() { name="$(strings /proc/device-tree/compatible | head -1)" - model=`grep "^machine" /proc/cpuinfo | sed "s/machine.*: \(.*\)/\1/g" | sed "s/.* - \(.*\)/\1/g"` + model="$(cat /proc/device-tree/model)" [ -z "$name" ] && name="unknown" [ -z "$model" ] && model="unknown" [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts index 6b30b52b71..7294720117 100644 --- a/target/linux/lantiq/dts/ACMP252.dts +++ b/target/linux/lantiq/dts/ACMP252.dts @@ -4,7 +4,7 @@ / { compatible = "audiocodes,mp-252", "lantiq,xway", "lantiq,danube"; - model = "ACMP252 - AudioCodes MediaPack MP-252"; + model = "AudioCodes MediaPack MP-252"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ALL0333CJ.dts b/target/linux/lantiq/dts/ALL0333CJ.dts index a6bd1e456d..16c5facb35 100644 --- a/target/linux/lantiq/dts/ALL0333CJ.dts +++ b/target/linux/lantiq/dts/ALL0333CJ.dts @@ -4,7 +4,7 @@ / { compatible = "allnet,all0333cj", "lantiq,xway", "lantiq,ase"; - model = "ALL0333CJ - Allnet ALL0333CJ DSL Modem"; + model = "Allnet ALL0333CJ DSL Modem"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts index cef0739f7e..4720b57dd3 100644 --- a/target/linux/lantiq/dts/ARV4510PW.dts +++ b/target/linux/lantiq/dts/ARV4510PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv4510pw", "lantiq,xway", "lantiq,danube"; - model = "ARV4510PW - Wippies, Elisa"; + model = "Wippies, Elisa"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dts b/target/linux/lantiq/dts/ARV4518PWR01.dts index cbaa7d60de..34f868f484 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01.dts +++ b/target/linux/lantiq/dts/ARV4518PWR01.dts @@ -4,5 +4,5 @@ / { compatible = "arcadyan,arv4518pwr01", "lantiq,xway", "lantiq,danube"; - model = "ARV4518PWR01 - SMC7908A-ISP"; + model = "SMC7908A-ISP"; }; diff --git a/target/linux/lantiq/dts/ARV4518PWR01A.dts b/target/linux/lantiq/dts/ARV4518PWR01A.dts index 4f2d688016..771d0146d8 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01A.dts +++ b/target/linux/lantiq/dts/ARV4518PWR01A.dts @@ -4,7 +4,7 @@ / { compatible = "arcadyan,arv4518pwr01a", "lantiq,xway", "lantiq,danube"; - model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221"; + model = "SMC7908A-ISP, Airties WAV-221"; fpi@10000000 { pci@E105400 { diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts index 21df4a3c28..8f781760f9 100644 --- a/target/linux/lantiq/dts/ARV4519PW.dts +++ b/target/linux/lantiq/dts/ARV4519PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv4519pw", "lantiq,xway", "lantiq,danube"; - model = "ARV4519PW - Vodafone Netfaster IAD 2, Pirelli P.RG A4201G"; + model = "Vodafone Netfaster IAD 2, Pirelli P.RG A4201G"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts index f9a51fa3ea..05e0dfe048 100644 --- a/target/linux/lantiq/dts/ARV4520PW.dts +++ b/target/linux/lantiq/dts/ARV4520PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv4520pw", "lantiq,xway", "lantiq,danube"; - model = "ARV4520PW - Easybox 800, WAV-281"; + model = "Easybox 800, WAV-281"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/dts/ARV4525PW.dts index a35ce61b23..61548c793a 100644 --- a/target/linux/lantiq/dts/ARV4525PW.dts +++ b/target/linux/lantiq/dts/ARV4525PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv4525pw", "lantiq,xway", "lantiq,danube"; - model = "ARV4525PW - Speedport W501V Typ A"; + model = "Speedport W501V Typ A"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts index 5ddee5fd24..d996e8b66f 100644 --- a/target/linux/lantiq/dts/ARV452CQW.dts +++ b/target/linux/lantiq/dts/ARV452CQW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv452cqw", "lantiq,xway", "lantiq,danube"; - model = "ARV452CQW - Arcor 801"; + model = "Arcor 801"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV7506PW11.dts b/target/linux/lantiq/dts/ARV7506PW11.dts index 992dabf82f..3ec4bf41a0 100644 --- a/target/linux/lantiq/dts/ARV7506PW11.dts +++ b/target/linux/lantiq/dts/ARV7506PW11.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv7506pw11", "lantiq,xway", "lantiq,danube"; - model = "ARV7506PW11 - Alice/O2 IAD 4421"; + model = "Alice/O2 IAD 4421"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts index 63d03b7600..dc3f614b9d 100644 --- a/target/linux/lantiq/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/dts/ARV7510PW22.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv7510pw22", "lantiq,xway", "lantiq,danube"; - model = "ARV7510PW22 - Astoria Networks"; + model = "Astoria Networks ARV7510PW22"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts index 3a092cb31c..41b1249323 100644 --- a/target/linux/lantiq/dts/ARV7518PW.dts +++ b/target/linux/lantiq/dts/ARV7518PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv7518pw", "lantiq,xway", "lantiq,danube"; - model = "ARV7518PW - Astoria Networks"; + model = "Astoria Networks ARV7518PW"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts index beb23bdf49..9983a7906f 100644 --- a/target/linux/lantiq/dts/ARV7519PW.dts +++ b/target/linux/lantiq/dts/ARV7519PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv7519pw", "lantiq,xway", "lantiq,danube"; - model = "ARV7519PW - Astoria Networks"; + model = "Astoria Networks ARV7519PW"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts index 86587116f1..9e2ae9d6f2 100644 --- a/target/linux/lantiq/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/dts/ARV7519RW22.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv7519rw22", "lantiq,xway", "lantiq,vr9"; - model = "ARV7519RW22 - Orange Livebox 2.1"; + model = "Orange Livebox 2.1"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts index c7dd89e251..0007535895 100644 --- a/target/linux/lantiq/dts/ARV7525PW.dts +++ b/target/linux/lantiq/dts/ARV7525PW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv7525pw", "lantiq,xway", "lantiq,danube"; - model = "ARV7525PW - Speedport W303V Typ A"; + model = "Speedport W303V Typ A"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts index 5ad25706c4..3591b43671 100644 --- a/target/linux/lantiq/dts/ARV752DPW.dts +++ b/target/linux/lantiq/dts/ARV752DPW.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv752dpw", "lantiq,xway", "lantiq,danube"; - model = "ARV752DPW - Arcor 802"; + model = "Arcor 802"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts index 75cb159612..8b5be8b76c 100644 --- a/target/linux/lantiq/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/dts/ARV752DPW22.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv752dpw22", "lantiq,xway", "lantiq,danube"; - model = "ARV752DPW22 - Arcor 803"; + model = "Arcor 803"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts index 97aef71afe..4edcde9763 100644 --- a/target/linux/lantiq/dts/ARV8539PW22.dts +++ b/target/linux/lantiq/dts/ARV8539PW22.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,arv8539pw22", "lantiq,xway", "lantiq,danube"; - model = "ARV8539PW22 - Speedport W 504V Typ A"; + model = "Speedport W 504V Typ A"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/ASL56026.dts b/target/linux/lantiq/dts/ASL56026.dts index 3fe9bc7234..293a3e27de 100644 --- a/target/linux/lantiq/dts/ASL56026.dts +++ b/target/linux/lantiq/dts/ASL56026.dts @@ -6,7 +6,7 @@ / { compatible = "alphanetworks,asl56026", "lantiq,xway", "lantiq,vr9"; - model = "ASL56026 - BT OpenReach VDSL Modem"; + model = "BT OpenReach VDSL Modem"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts index 5f051cd861..961fd9b929 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts @@ -6,7 +6,7 @@ / { compatible = "bt,homehub-v2b", "lantiq,xway", "lantiq,danube"; - model = "BTHOMEHUBV2B - BT Home Hub 2B"; /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */ + model = "BT Home Hub 2B"; /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */ chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts index 36180da0a7..d37b9728d2 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts @@ -6,7 +6,7 @@ / { compatible = "bt,homehub-v3a", "lantiq,xway", "lantiq,ar9"; - model = "BTHOMEHUBV3A - BT Home Hub 3A"; /* SoC: Lantiq ar9 @ 333MHz */ + model = "BT Home Hub 3A"; /* SoC: Lantiq ar9 @ 333MHz */ chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts index eba32beaf0..4bdeddcafa 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts @@ -6,7 +6,7 @@ / { compatible = "bt,homehub-v5a", "lantiq,xway", "lantiq,vr9"; - model = "BTHOMEHUBV5A - BT Home Hub 5A"; + model = "BT Home Hub 5A"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts index 069e62d3e0..e5637efca5 100644 --- a/target/linux/lantiq/dts/DGN1000B.dts +++ b/target/linux/lantiq/dts/DGN1000B.dts @@ -6,7 +6,7 @@ / { compatible = "netgear,dgn1000b", "lantiq,xway", "lantiq,ase"; - model = "DGN1000B - Netgear DGN1000B"; + model = "Netgear DGN1000B"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/DGN3500.dts b/target/linux/lantiq/dts/DGN3500.dts index 16bef1128f..98a2ebd98e 100644 --- a/target/linux/lantiq/dts/DGN3500.dts +++ b/target/linux/lantiq/dts/DGN3500.dts @@ -4,5 +4,5 @@ / { compatible = "netgear,dgn3500", "lantiq,xway", "lantiq,ar9"; - model = "DGN3500 - Netgear DGN3500"; + model = "Netgear DGN3500"; }; diff --git a/target/linux/lantiq/dts/DGN3500B.dts b/target/linux/lantiq/dts/DGN3500B.dts index 737ccf2e3a..d1d788cc7d 100644 --- a/target/linux/lantiq/dts/DGN3500B.dts +++ b/target/linux/lantiq/dts/DGN3500B.dts @@ -4,5 +4,5 @@ / { compatible = "netgear,dgn3500b", "lantiq,xway", "lantiq,ar9"; - model = "DGN3500B - Netgear DGN3500B"; + model = "Netgear DGN3500B"; }; diff --git a/target/linux/lantiq/dts/DM200.dts b/target/linux/lantiq/dts/DM200.dts index 532413468e..62eb908139 100644 --- a/target/linux/lantiq/dts/DM200.dts +++ b/target/linux/lantiq/dts/DM200.dts @@ -6,7 +6,7 @@ / { compatible = "netgear,dm200", "lantiq,xway", "lantiq,ar9"; - model = "DM200 - Netgear DM200"; + model = "Netgear DM200"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts index 28858d9ad0..ebd30a7c06 100644 --- a/target/linux/lantiq/dts/EASY50712.dts +++ b/target/linux/lantiq/dts/EASY50712.dts @@ -4,7 +4,7 @@ / { compatible = "lantiq,easy50712", "lantiq,xway", "lantiq,danube"; - model = "EASY50712 - Intel EASY50712 Nand"; + model = "Intel EASY50712 Nand"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/EASY80920NAND.dts b/target/linux/lantiq/dts/EASY80920NAND.dts index f8c902affe..095bd564da 100644 --- a/target/linux/lantiq/dts/EASY80920NAND.dts +++ b/target/linux/lantiq/dts/EASY80920NAND.dts @@ -5,7 +5,7 @@ / { compatible = "lantiq,easy80920-nand", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9"; - model = "EASY80920NAND - Intel EASY80920 Nand"; + model = "Intel EASY80920 Nand"; chosen { bootargs = "ubi.mtd=ubi ubi.block=0,rootfsA root=/dev/ubiblock0_1"; diff --git a/target/linux/lantiq/dts/EASY80920NOR.dts b/target/linux/lantiq/dts/EASY80920NOR.dts index c8fc3690d4..e273138d8a 100644 --- a/target/linux/lantiq/dts/EASY80920NOR.dts +++ b/target/linux/lantiq/dts/EASY80920NOR.dts @@ -5,7 +5,7 @@ / { compatible = "lantiq,easy80920-nor", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9"; - model = "EASY80920NOR - Intel EASY80920 Nor"; + model = "Intel EASY80920 Nor"; fpi@10000000 { localbus@0 { diff --git a/target/linux/lantiq/dts/EASY88388.dts b/target/linux/lantiq/dts/EASY88388.dts index 8ba6238ad6..a9c5b3c24b 100644 --- a/target/linux/lantiq/dts/EASY88388.dts +++ b/target/linux/lantiq/dts/EASY88388.dts @@ -5,7 +5,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY88388 - Lantiq Falcon FTTDP8 Reference Board"; + model = "Lantiq Falcon FTTDP8 Reference Board"; compatible = "lantiq,easy88388", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY88444.dts b/target/linux/lantiq/dts/EASY88444.dts index 2bc1365268..ceb81ea13b 100644 --- a/target/linux/lantiq/dts/EASY88444.dts +++ b/target/linux/lantiq/dts/EASY88444.dts @@ -5,7 +5,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY88444 - Lantiq Falcon FTTdp G.FAST Reference Board"; + model = "Lantiq Falcon FTTdp G.FAST Reference Board"; compatible = "lantiq,easy88444", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98000NAND.dts b/target/linux/lantiq/dts/EASY98000NAND.dts index d6f520aa5d..a40cef3931 100644 --- a/target/linux/lantiq/dts/EASY98000NAND.dts +++ b/target/linux/lantiq/dts/EASY98000NAND.dts @@ -4,7 +4,7 @@ #include "EASY98000-base.dtsi" / { - model = "EASY98000NAND - Lantiq Falcon (NAND)"; + model = "Lantiq Falcon (NAND)"; compatible = "lantiq,easy98000-nand", "lantiq,easy98000", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98000NOR.dts b/target/linux/lantiq/dts/EASY98000NOR.dts index 6ff3b7e17c..ad53bf96e9 100644 --- a/target/linux/lantiq/dts/EASY98000NOR.dts +++ b/target/linux/lantiq/dts/EASY98000NOR.dts @@ -4,7 +4,7 @@ #include "EASY98000-base.dtsi" / { - model = "EASY98000NOR - Lantiq Falcon (NOR)"; + model = "Lantiq Falcon (NOR)"; compatible = "lantiq,easy98000-nor", "lantiq,easy98000", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98000SFLASH.dts b/target/linux/lantiq/dts/EASY98000SFLASH.dts index 7a7220fbf7..bbe524e94e 100644 --- a/target/linux/lantiq/dts/EASY98000SFLASH.dts +++ b/target/linux/lantiq/dts/EASY98000SFLASH.dts @@ -5,7 +5,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98000SFLASH - Lantiq Falcon (SFLASH)"; + model = "Lantiq Falcon (SFLASH)"; compatible = "lantiq,easy98000-sflash", "lantiq,easy98000", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98020.dts b/target/linux/lantiq/dts/EASY98020.dts index c36349ccf5..c0970ef48c 100644 --- a/target/linux/lantiq/dts/EASY98020.dts +++ b/target/linux/lantiq/dts/EASY98020.dts @@ -6,7 +6,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98020 - Lantiq Falcon Reference Board"; + model = "Lantiq Falcon Reference Board"; compatible = "lantiq,easy98020", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98020V18.dts b/target/linux/lantiq/dts/EASY98020V18.dts index e32a75d068..9aa1be91ed 100644 --- a/target/linux/lantiq/dts/EASY98020V18.dts +++ b/target/linux/lantiq/dts/EASY98020V18.dts @@ -6,7 +6,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98020V18 - Lantiq Falcon Reference Board V1.8"; + model = "Lantiq Falcon Reference Board V1.8"; compatible = "lantiq,easy98020-v18", "lantiq,easy98020", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98021.dts b/target/linux/lantiq/dts/EASY98021.dts index 6a4c6142c2..7b2e490fcc 100644 --- a/target/linux/lantiq/dts/EASY98021.dts +++ b/target/linux/lantiq/dts/EASY98021.dts @@ -6,7 +6,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98021 - Lantiq Falcon HGU Reference Board"; + model = "Lantiq Falcon HGU Reference Board"; compatible = "lantiq,easy98021", "lantiq,easy98020", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98035SYNCE.dts b/target/linux/lantiq/dts/EASY98035SYNCE.dts index d48eeb2cd0..df941cdb67 100644 --- a/target/linux/lantiq/dts/EASY98035SYNCE.dts +++ b/target/linux/lantiq/dts/EASY98035SYNCE.dts @@ -4,7 +4,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98035SYNCE - Lantiq Falcon SFP Stick with SyncE"; + model = "Lantiq Falcon SFP Stick with SyncE"; compatible = "lantiq,easy98035synce", "lantiq,falcon-sfp", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98035SYNCE1588.dts b/target/linux/lantiq/dts/EASY98035SYNCE1588.dts index 31524f48b1..a3abc6e707 100644 --- a/target/linux/lantiq/dts/EASY98035SYNCE1588.dts +++ b/target/linux/lantiq/dts/EASY98035SYNCE1588.dts @@ -4,7 +4,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98035SYNCE1588 - Lantiq Falcon SFP Stick with SyncE/1588"; + model = "Lantiq Falcon SFP Stick with SyncE/1588"; compatible = "lantiq,easy98035synce1588", "lantiq,falcon-sfp", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/FALCON-MDU.dts b/target/linux/lantiq/dts/FALCON-MDU.dts index 32b7e23557..6710bbe98e 100644 --- a/target/linux/lantiq/dts/FALCON-MDU.dts +++ b/target/linux/lantiq/dts/FALCON-MDU.dts @@ -6,7 +6,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "FALCON-MDU - Lantiq Falcon / Vinax MDU Board"; + model = "Lantiq Falcon / Vinax MDU Board"; compatible = "lantiq,falcon-mdu", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/FALCON-SFP.dts b/target/linux/lantiq/dts/FALCON-SFP.dts index bba52d8768..8d45de4ebe 100644 --- a/target/linux/lantiq/dts/FALCON-SFP.dts +++ b/target/linux/lantiq/dts/FALCON-SFP.dts @@ -4,7 +4,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "FALCON-SFP - Lantiq Falcon SFP Stick"; + model = "Lantiq Falcon SFP Stick"; compatible = "lantiq,falcon-sfp", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts index 448569466c..76f7f877bc 100644 --- a/target/linux/lantiq/dts/FRITZ3370.dts +++ b/target/linux/lantiq/dts/FRITZ3370.dts @@ -6,7 +6,7 @@ / { compatible = "avm,fritz3370", "lantiq,xway", "lantiq,vr9"; - model = "FRITZ3370 - Fritz!Box WLAN 3370"; + model = "Fritz!Box WLAN 3370"; chosen { bootargs = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9"; diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts index 9e23519e4b..34d0df9b3b 100644 --- a/target/linux/lantiq/dts/FRITZ7320.dts +++ b/target/linux/lantiq/dts/FRITZ7320.dts @@ -6,7 +6,7 @@ / { compatible = "avm,fritz7320", "lantiq,xway", "lantiq,ar9"; - model = "FRITZ7320 - 1&1 HomeServer"; + model = "1&1 HomeServer"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts index 3878786f7c..cf82451400 100644 --- a/target/linux/lantiq/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/dts/FRITZ7360SL.dts @@ -6,7 +6,7 @@ / { compatible = "avm,fritz7360sl", "lantiq,xway", "lantiq,vr9"; - model = "FRITZ7360SL - 1&1 HomeServer"; + model = "1&1 HomeServer"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/dts/GIGASX76X.dts index 27c6fe2f7d..99ccbce296 100644 --- a/target/linux/lantiq/dts/GIGASX76X.dts +++ b/target/linux/lantiq/dts/GIGASX76X.dts @@ -6,7 +6,7 @@ / { compatible = "siemens,gigaset-sx76x", "lantiq,xway", "lantiq,danube"; - model = "GIGASX76X - Gigaset SX761,SX762,SX763"; + model = "Gigaset SX761,SX762,SX763"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts index e66f843c61..01016f45c9 100644 --- a/target/linux/lantiq/dts/H201L.dts +++ b/target/linux/lantiq/dts/H201L.dts @@ -6,7 +6,7 @@ / { compatible = "zte,h201l", "lantiq,xway", "lantiq,ar9"; - model = "H201L - ZTE H210L"; + model = "ZTE H210L"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts index a0e510edbc..a24eb3ee5b 100644 --- a/target/linux/lantiq/dts/P2601HNFX.dts +++ b/target/linux/lantiq/dts/P2601HNFX.dts @@ -6,7 +6,7 @@ / { compatible = "zyxel,p-2601hn", "lantiq,xway", "lantiq,danube"; - model = "P2601HNFX - ZyXEL P-2601HN-Fx"; + model = "ZyXEL P-2601HN-Fx"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts index bb628aed0b..4a29cd9296 100644 --- a/target/linux/lantiq/dts/P2812HNUF1.dts +++ b/target/linux/lantiq/dts/P2812HNUF1.dts @@ -4,7 +4,7 @@ / { compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9"; - model = "P2812HNUF1 - ZyXEL P-2812HNU-F1"; + model = "ZyXEL P-2812HNU-F1"; aliases { led-usb = &usb1; diff --git a/target/linux/lantiq/dts/P2812HNUF3.dts b/target/linux/lantiq/dts/P2812HNUF3.dts index a842fe627b..d37ad0a8e5 100644 --- a/target/linux/lantiq/dts/P2812HNUF3.dts +++ b/target/linux/lantiq/dts/P2812HNUF3.dts @@ -4,7 +4,7 @@ / { compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9"; - model = "P2812HNUF3 - ZyXEL P-2812HNU-F3"; + model = "ZyXEL P-2812HNU-F3"; fpi@10000000 { localbus@0 { diff --git a/target/linux/lantiq/dts/TDW8970.dts b/target/linux/lantiq/dts/TDW8970.dts index 31c81f7f75..25eb3dac67 100644 --- a/target/linux/lantiq/dts/TDW8970.dts +++ b/target/linux/lantiq/dts/TDW8970.dts @@ -4,5 +4,5 @@ / { compatible = "tplink,tdw8970", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9"; - model = "TDW8970 - TP-LINK TD-W8970"; + model = "TP-LINK TD-W8970"; }; diff --git a/target/linux/lantiq/dts/TDW8980.dts b/target/linux/lantiq/dts/TDW8980.dts index cb0afece2c..def34b55bb 100644 --- a/target/linux/lantiq/dts/TDW8980.dts +++ b/target/linux/lantiq/dts/TDW8980.dts @@ -4,7 +4,7 @@ / { compatible = "tplink,tdw8980", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9"; - model = "TDW8980 - TP-LINK TD-W8980"; + model = "TP-LINK TD-W8980"; fpi@10000000 { gpio: pinmux@E100B10 { diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts index 2d94e1fe1d..cb0d5ddecd 100644 --- a/target/linux/lantiq/dts/VG3503J.dts +++ b/target/linux/lantiq/dts/VG3503J.dts @@ -6,7 +6,7 @@ / { compatible = "arcadyan,vg3503j", "lantiq,xway", "lantiq,vr9"; - model = "VG3503J - BT OpenReach VDSL Modem"; + model = "BT OpenReach VDSL Modem"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/dts/VGV7510KW22BRN.dts index 9bdc7cb13d..d0be62f632 100644 --- a/target/linux/lantiq/dts/VGV7510KW22BRN.dts +++ b/target/linux/lantiq/dts/VGV7510KW22BRN.dts @@ -4,7 +4,7 @@ / { compatible = "arcadyan,vgv7510kw22-brn", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9"; - model = "VGV7510KW22BRN - o2 Box 6431"; + model = "o2 Box 6431"; sram@1F000000 { cgu@103000 { diff --git a/target/linux/lantiq/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/dts/VGV7510KW22NOR.dts index ffafcc4f02..1d21e14f0a 100644 --- a/target/linux/lantiq/dts/VGV7510KW22NOR.dts +++ b/target/linux/lantiq/dts/VGV7510KW22NOR.dts @@ -4,7 +4,7 @@ / { compatible = "arcadyan,vgv7510kw22-nor", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9"; - model = "VGV7510KW22NOR - o2 Box 6431"; + model = "o2 Box 6431"; fpi@10000000 { localbus@0 { diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts index 8ed2f63a7c..f30d2f920e 100644 --- a/target/linux/lantiq/dts/VGV7519BRN.dts +++ b/target/linux/lantiq/dts/VGV7519BRN.dts @@ -5,7 +5,7 @@ / { compatible = "arcadyan,vgv7519-brn", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9"; - model = "VGV7519BRN - KPN Experiabox V8"; + model = "KPN Experiabox V8"; fpi@10000000 { localbus@0 { diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/dts/VGV7519NOR.dts index 7ba6ecf235..ec548fbe72 100644 --- a/target/linux/lantiq/dts/VGV7519NOR.dts +++ b/target/linux/lantiq/dts/VGV7519NOR.dts @@ -5,7 +5,7 @@ / { compatible = "arcadyan,vgv7519-nor", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9"; - model = "VGV7519NOR - KPN Experiabox V8"; + model = "KPN Experiabox V8"; fpi@10000000 { localbus@0 { diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts index 453be63079..b063d758c3 100644 --- a/target/linux/lantiq/dts/VR200v.dts +++ b/target/linux/lantiq/dts/VR200v.dts @@ -6,7 +6,7 @@ / { compatible = "tplink,vr200v", "lantiq,xway", "lantiq,vr9"; - model = "VR200v - TP-LINK Archer VR200v"; + model = "TP-LINK Archer VR200v"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts index 9711a31cb2..fab99d00e7 100644 --- a/target/linux/lantiq/dts/WBMR.dts +++ b/target/linux/lantiq/dts/WBMR.dts @@ -6,7 +6,7 @@ / { compatible = "buffalo,wbmr-hp-g300h", "lantiq,xway", "lantiq,ar9"; - model = "WBMR - Buffalo WBMR-HP-G300H"; + model = "Buffalo WBMR-HP-G300H"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts index 4d8fd93d1f..de2be582f5 100644 --- a/target/linux/lantiq/dts/WBMR300.dts +++ b/target/linux/lantiq/dts/WBMR300.dts @@ -6,7 +6,7 @@ / { compatible = "buffalo,wbmr-300hpd", "lantiq,xway", "lantiq,vr9"; - model = "WBMR300 - Buffalo WBMR-300HPD"; + model = "Buffalo WBMR-300HPD"; chosen { bootargs = "console=ttyLTQ0,115200";