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 <[email protected]>
Elewei · Dec 16, 2017 · 26dc65b · 26dc65b
1 parent 63d7f7f
commit 26dc65b
Show file tree

Hide file tree

Showing 60 changed files with 60 additions and 60 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";