brcm63xx: align DTS model with Makefile and compatible

Since the model string in DTS is not required to derive board name
anymore, we can now align it with the model name in Makefile and
the compatible.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

15 files changed, 18 insertions, 18 deletions

diff --git a/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts
index 3ceddd09a2a..f09310e2bb0 100644
--- a/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts
+++ b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Sagem F@ST2704N";
+	model = "Sagem F@st 2704N";
 	compatible = "sagem,fast-2704n", "brcm,bcm6318";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
index 1fe0d44810b..d00d8fb4e56 100644
--- a/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Sagem F@ST2704V2";
+	model = "Sagem F@st 2704 V2";
 	compatible = "sagem,fast-2704-v2", "brcm,bcm6328";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
index a77362f2f6d..0975cffd65e 100644
--- a/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "BT Voyager V2500V";
+	model = "BT Voyager 2500V";
 	compatible = "bt,voyager-2500v-bb", "brcm,bcm6348";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts
index 60b945555b3..945fcc1f189 100644
--- a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Sagem F@ST2404";
+	model = "Sagem F@st 2404";
 	compatible = "sagem,fast-2404", "brcm,bcm6348";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts
index a3394dd70d9..a2d27175758 100644
--- a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Sagem F@ST2604";
+	model = "Sagem F@st 2604";
 	compatible = "sagem,fast-2604", "brcm,bcm6348";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
index aa2f3372531..8b0d1cacfd6 100644
--- a/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "T-Com Speedport W500 V";
+	model = "T-Com Speedport W 500V";
 	compatible = "t-com,speedport-w-500v", "brcm,bcm6348";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts
index 35ce1b010d1..366eaf3bcd1 100644
--- a/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "USRobotics 9108";
+	model = "USRobotics USR9108";
 	compatible = "usrobotics,usr9108", "brcm,bcm6348";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts
index e1a3046c7fb..de22658843f 100644
--- a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "SFR Neuf Box 4 (Foxconn)";
+	model = "SFR Neufbox 4 (Foxconn)";
 	compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts
index b28aaa3fe73..db6c5f33069 100644
--- a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "SFR Neuf Box 4 (Sercomm)";
+	model = "SFR Neufbox 4 (Sercomm)";
 	compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
index 68f8588f55b..4aed5f0eb62 100644
--- a/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "T-Com Speedport W303 V";
+	model = "T-Com Speedport W 303V";
 	compatible = "t-com,speedport-w-303v", "brcm,bcm6358";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts
index d1bf98a2b13..db8ce7318f1 100644
--- a/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts
+++ b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Sagem F@ST2504n";
+	model = "Sagem F@st 2504N";
 	compatible = "sagem,fast-2504n", "brcm,bcm6362";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts
index a5184ff5552..031aff0748a 100644
--- a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts
+++ b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "SFR neufbox 6 (Sercomm)";
+	model = "SFR Neufbox 6 (Sercomm)";
 	compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
index 36598645a3a..77ecc62abd1 100644
--- a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Huawei HG622";
+	model = "Huawei EchoLife HG622";
 	compatible = "huawei,echolife-hg622", "brcm,bcm6368";
 
 	chosen {
diff --git a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
index 10fdcc6fd14..3f855bf0c9a 100644
--- a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
@@ -5,7 +5,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Huawei HG655b";
+	model = "Huawei EchoLife HG655b";
 	compatible = "huawei,echolife-hg655b", "brcm,bcm6368";
 
 	chosen {
diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk
index 433e5859b65..bc96b2a24e6 100644
--- a/target/linux/brcm63xx/image/bcm63xx.mk
+++ b/target/linux/brcm63xx/image/bcm63xx.mk
@@ -974,7 +974,7 @@ TARGET_DEVICES += sercomm_ad1018-nor
 define Device/sfr_neufbox-4-sercomm-r0
   $(Device/bcm63xx)
   DEVICE_VENDOR := SFR
-  DEVICE_MODEL := Neufbox4
+  DEVICE_MODEL := Neufbox 4
   DEVICE_VARIANT := Sercomm
   CFE_BOARD_ID := 96358VW
   CFE_CHIP_ID := 6358
@@ -986,7 +986,7 @@ TARGET_DEVICES += sfr_neufbox-4-sercomm-r0
 define Device/sfr_neufbox-4-foxconn-r1
   $(Device/bcm63xx)
   DEVICE_VENDOR := SFR
-  DEVICE_MODEL := Neufbox4
+  DEVICE_MODEL := Neufbox 4
   DEVICE_VARIANT := Foxconn
   CFE_BOARD_ID := 96358VW
   CFE_CHIP_ID := 6358
@@ -998,7 +998,7 @@ TARGET_DEVICES += sfr_neufbox-4-foxconn-r1
 define Device/sfr_neufbox-6-sercomm-r0
   $(Device/bcm63xx)
   DEVICE_VENDOR := SFR
-  DEVICE_MODEL := Neufbox6
+  DEVICE_MODEL := Neufbox 6
   CFE_BOARD_ID := NB6-SER-r0
   CFE_CHIP_ID := 6362
   CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
@@ -1121,7 +1121,7 @@ TARGET_DEVICES += tp-link_td-w8900gb
 define Device/usrobotics_usr9108
   $(Device/bcm63xx)
   DEVICE_VENDOR := USRobotics
-  DEVICE_MODEL := 9108
+  DEVICE_MODEL := USR9108
   CFE_BOARD_ID := 96348GW-A
   CFE_CHIP_ID := 6348
   DEVICE_PACKAGES := $(B43_PACKAGES) $(USB1_PACKAGES)