brcm63xx: use more systematic names for image and DTS files

This changes brcm63xx target to achieve consistency between image
names, device nodes names, compatible, DTS name and device name
as much as possible. As with other targets, having consistent
names is supposed to make life easier for developers and reduces
the number of "variables" in the system. In particular, applying
the DTS scheme will make it easier to find the correct file and
architecture.

DTS files are named based on the increasingly common
soc-vendor-model scheme, using hyphens for separation as this seems
to be the kernel way. Since the compatible is not used at the
moment, I took the chance to also align them with this patch.

For the SOC, the already existing CFE_CHIP_ID can be exploiting
for all but two devices.

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

89 files changed, 34 insertions, 34 deletions

diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/bcm3368-netgear-cvg834g.dts
index 2b25d009b3..2b25d009b3 100644
--- a/target/linux/brcm63xx/dts/cvg834g.dts
+++ b/target/linux/brcm63xx/dts/bcm3368-netgear-cvg834g.dts
diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts
index 99f8af2189..4edab6418c 100644
--- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Broadcom BCM96318REF_P300 reference board";
-	compatible = "brcm,bcm96318ref_p300", "brcm,bcm6318";
+	compatible = "brcm,bcm96318ref-p300", "brcm,bcm6318";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref.dts
index f6136b5886..f6136b5886 100644
--- a/target/linux/brcm63xx/dts/bcm96318ref.dts
+++ b/target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref.dts
diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
index d1085e7eed..d1085e7eed 100644
--- a/target/linux/brcm63xx/dts/ar-5315u.dts
+++ b/target/linux/brcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
index 2052a6e305..cf5b296cb7 100644
--- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts
+++ b/target/linux/brcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "D-Link DSL-2750B/DSL-2751 rev D1";
-	compatible = "d-link,dsl-275xb-d", "brcm,bcm6318";
+	compatible = "d-link,dsl-275xb-d1", "brcm,bcm6318";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts
index 33842cc646..3ceddd09a2 100644
--- a/target/linux/brcm63xx/dts/fast2704n.dts
+++ b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2704N";
-	compatible = "sagem,f@st2704n", "brcm,bcm6318";
+	compatible = "sagem,fast-2704n", "brcm,bcm6318";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts
index 57046a7878..b4176885ed 100644
--- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Broadcom BCM963268BU_P300 reference board";
-	compatible = "brcm,bcm963268bu_p300", "brcm,bcm63268";
+	compatible = "brcm,bcm963268bu-p300", "brcm,bcm63268";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts
index bb1609e040..bb1609e040 100644
--- a/target/linux/brcm63xx/dts/bcm963269bhr.dts
+++ b/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts
diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/bcm63268-inteno-vg50.dts
index dbbea13f1b..dbbea13f1b 100644
--- a/target/linux/brcm63xx/dts/vg50.dts
+++ b/target/linux/brcm63xx/dts/bcm63268-inteno-vg50.dts
diff --git a/target/linux/brcm63xx/dts/sr102.dts b/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts
index 45c1302489..45c1302489 100644
--- a/target/linux/brcm63xx/dts/sr102.dts
+++ b/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts
diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/bcm6328-adb-a4001n.dts
index 814274b611..814274b611 100644
--- a/target/linux/brcm63xx/dts/a4001n.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-adb-a4001n.dts
diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/bcm6328-adb-a4001n1.dts
index e58f865589..e58f865589 100644
--- a/target/linux/brcm63xx/dts/a4001n1.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-adb-a4001n1.dts
diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
index 956ca59d69..6fbac7d461 100644
--- a/target/linux/brcm63xx/dts/bcm963281TAN.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Broadcom bcm963281TAN reference board";
-	compatible = "brcm,bcm963281TAN", "brcm,bcm6328";
+	compatible = "brcm,bcm963281tan", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
index a0a6c9ec54..a0a6c9ec54 100644
--- a/target/linux/brcm63xx/dts/bcm96328avng.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
index e336024913..e336024913 100644
--- a/target/linux/brcm63xx/dts/ar-5381u.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
index 209eda37f4..209eda37f4 100644
--- a/target/linux/brcm63xx/dts/ar-5387un.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
index 1d09232ba5..f3fab05062 100644
--- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "D-Link DSL-2740B/DSL-2741B rev F1";
-	compatible = "d-link,dsl-274xb-f", "brcm,bcm6328";
+	compatible = "d-link,dsl-274xb-f1", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
index a782126300..5084bd8877 100644
--- a/target/linux/brcm63xx/dts/r5010unv2.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "NuCom R5010UN v2";
-	compatible = "nucom,r5010unv2", "brcm,bcm6328";
+	compatible = "nucom,r5010un-v2", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
index 1de853a025..1fe0d44810 100644
--- a/target/linux/brcm63xx/dts/fast2704v2.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2704V2";
-	compatible = "sagem,f@st2704v2", "brcm,bcm6328";
+	compatible = "sagem,fast-2704-v2", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
index 36899a4cc0..36899a4cc0 100644
--- a/target/linux/brcm63xx/dts/ad1018-nor.dts
+++ b/target/linux/brcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
index 92363ec3a1..92363ec3a1 100644
--- a/target/linux/brcm63xx/dts/bcm96338GW.dts
+++ b/target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338w.dts
index 3f6e8c0686..3f6e8c0686 100644
--- a/target/linux/brcm63xx/dts/bcm96338W.dts
+++ b/target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338w.dts
diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
index 8cf96a3a5c..8cf96a3a5c 100644
--- a/target/linux/brcm63xx/dts/dsl-2640u.dts
+++ b/target/linux/brcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/bcm6338-dynalink-rta1320.dts
index bac605651f..bac605651f 100644
--- a/target/linux/brcm63xx/dts/rta1320.dts
+++ b/target/linux/brcm63xx/dts/bcm6338-dynalink-rta1320.dts
diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/brcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts
index 5aea2ddc8d..5aea2ddc8d 100644
--- a/target/linux/brcm63xx/dts/bcm96345GW2.dts
+++ b/target/linux/brcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts
diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/bcm6345-dynalink-rta770bw.dts
index f678762c86..f678762c86 100644
--- a/target/linux/brcm63xx/dts/rta770bw.dts
+++ b/target/linux/brcm63xx/dts/bcm6345-dynalink-rta770bw.dts
diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/bcm6345-dynalink-rta770w.dts
index ad0e7ce27d..ad0e7ce27d 100644
--- a/target/linux/brcm63xx/dts/rta770w.dts
+++ b/target/linux/brcm63xx/dts/bcm6345-dynalink-rta770w.dts
diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/bcm6348-asmax-ar-1004g.dts
index ffda187fda..bf7b4a3ec4 100644
--- a/target/linux/brcm63xx/dts/ar1004g.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-asmax-ar-1004g.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "ASMAX AR 1004g";
-	compatible = "asmax,ar1004g", "brcm,bcm6348";
+	compatible = "asmax,ar-1004g", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/bcm6348-belkin-f5d7633.dts
index c39247d405..c39247d405 100644
--- a/target/linux/brcm63xx/dts/f5d7633.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-belkin-f5d7633.dts
diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
index 014fd3fb9d..014fd3fb9d 100644
--- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
index aeda3c2659..aeda3c2659 100644
--- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
index 61a0a3dd5c..61a0a3dd5c 100644
--- a/target/linux/brcm63xx/dts/bcm96348GW.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348r.dts
index 20c88c48fc..20c88c48fc 100644
--- a/target/linux/brcm63xx/dts/bcm96348R.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348r.dts
diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2110.dts
index a1b6c2177b..1eac7e3745 100644
--- a/target/linux/brcm63xx/dts/v2110.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2110.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "BT Voyager 2110";
-	compatible = "bt,v2110", "brcm,bcm6348";
+	compatible = "bt,voyager-2110", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
index 591d00d503..a77362f2f6 100644
--- a/target/linux/brcm63xx/dts/v2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "BT Voyager V2500V";
-	compatible = "bt,v2500v-bb", "brcm,bcm6348";
+	compatible = "bt,voyager-2500v-bb", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/bcm6348-comtrend-ct-5365.dts
index 0d36aa21e0..0d36aa21e0 100644
--- a/target/linux/brcm63xx/dts/ct-5365.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-comtrend-ct-5365.dts
diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
index d6664ab81c..ead9bc3a20 100644
--- a/target/linux/brcm63xx/dts/ct536plus.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Comtrend CT-536+/CT-5621T";
-	compatible = "comtrend,ct-536+", "brcm,bcm6348";
+	compatible = "comtrend,ct-536plus", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts
index 4213822a3e..4213822a3e 100644
--- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts
diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/bcm6348-davolink-dv-201amr.dts
index 6cafc891aa..6cafc891aa 100644
--- a/target/linux/brcm63xx/dts/dv-201amr.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-davolink-dv-201amr.dts
diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/bcm6348-dynalink-rta1025w.dts
index 122e049b3c..122e049b3c 100644
--- a/target/linux/brcm63xx/dts/rta1025w.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-dynalink-rta1025w.dts
diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/brcm63xx/dts/bcm6348-inventel-livebox-1.dts
index 9d5c2e100b..6e80675ff7 100644
--- a/target/linux/brcm63xx/dts/livebox-blue-5g.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-inventel-livebox-1.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Inventel Livebox 1";
-	compatible = "inventel,livebox-blue-5g", "brcm,bcm6348";
+	compatible = "inventel,livebox-1", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/bcm6348-netgear-dg834g-v4.dts
index 4ea096e81a..4ea096e81a 100644
--- a/target/linux/brcm63xx/dts/dg834g_v4.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-netgear-dg834g-v4.dts
diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts
index 32ab365a8d..f7e203227c 100644
--- a/target/linux/brcm63xx/dts/dg834gtpn.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Netgear DG834GT/PN";
-	compatible = "netgear,dg834gtpn", "brcm,bcm6348";
+	compatible = "netgear,dg834gt-pn", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts
index c9f75f389f..60b945555b 100644
--- a/target/linux/brcm63xx/dts/fast2404.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2404";
-	compatible = "sagem,f@st2404", "brcm,bcm6348";
+	compatible = "sagem,fast-2404", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts
index 52458a253f..a3394dd70d 100644
--- a/target/linux/brcm63xx/dts/fast2604.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2604";
-	compatible = "sagem,f@st2604", "brcm,bcm6348";
+	compatible = "sagem,fast-2604", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
index 8ca6dddd10..aa2f337253 100644
--- a/target/linux/brcm63xx/dts/spw500v.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "T-Com Speedport W500 V";
-	compatible = "t-com,spw500v", "brcm,bcm6348";
+	compatible = "t-com,speedport-w-500v", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/bcm6348-tecom-gw6000.dts
index 4822b04926..4822b04926 100644
--- a/target/linux/brcm63xx/dts/gw6000.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-tecom-gw6000.dts
diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/bcm6348-tecom-gw6200.dts
index c86cbf9203..c86cbf9203 100644
--- a/target/linux/brcm63xx/dts/gw6200.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-tecom-gw6200.dts
diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/bcm6348-telsey-cpva502plus.dts
index db08e7a97d..71620bc655 100644
--- a/target/linux/brcm63xx/dts/cpva502plus.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-telsey-cpva502plus.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Telsey CPVA502+";
-	compatible = "telsey,cpva502+", "brcm,bcm6348";
+	compatible = "telsey,cpva502plus", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/bcm6348-telsey-magic.dts
index 1358ebe99f..1358ebe99f 100644
--- a/target/linux/brcm63xx/dts/magic.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-telsey-magic.dts
diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts
index be111edd40..be111edd40 100644
--- a/target/linux/brcm63xx/dts/td-w8900gb.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts
diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts
index fd0d6d4bcd..35ce1b010d 100644
--- a/target/linux/brcm63xx/dts/usr9108.dts
+++ b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "USRobotics 9108";
-	compatible = "usr,9108", "brcm,bcm6348";
+	compatible = "usrobotics,usr9108", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/bcm6358-alcatel-rg100a.dts
index 22f50d5ada..22f50d5ada 100644
--- a/target/linux/brcm63xx/dts/rg100a.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-alcatel-rg100a.dts
diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw.dts
index 669d1943f4..669d1943f4 100644
--- a/target/linux/brcm63xx/dts/bcm96358VW.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw.dts
diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts
index a4a977e73d..a4a977e73d 100644
--- a/target/linux/brcm63xx/dts/bcm96358VW2.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts
diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/bcm6358-bt-home-hub-2-a.dts
index 836c43cae7..351b2945d3 100644
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-bt-home-hub-2-a.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "BT Home Hub 2.0 Type A";
-	compatible = "thomson,homehub2a", "brcm,bcm6358";
+	compatible = "bt,home-hub-2-a", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/bcm6358-comtrend-ct-6373.dts
index c5e38ba6f6..c5e38ba6f6 100644
--- a/target/linux/brcm63xx/dts/ct-6373.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-comtrend-ct-6373.dts
diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/bcm6358-d-link-dsl-2650u.dts
index c2dad26b12..c2dad26b12 100644
--- a/target/linux/brcm63xx/dts/dsl-2650u.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-d-link-dsl-2650u.dts
diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts
index 6897378fe8..6897378fe8 100644
--- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts
diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts
index 95a627dfb2..fcf112a7e0 100644
--- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "D-Link DVA-G3810BN/TL";
-	compatible = "d-link,dva-g3810bn/tl", "brcm,bcm6358";
+	compatible = "d-link,dva-g3810bn-tl", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts
index ebbf1f3afe..2176ea88d2 100644
--- a/target/linux/brcm63xx/dts/hg520v.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG520v";
-	compatible = "huawei,hg520v", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg520v", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
index 92e5e48ac2..d23066866e 100644
--- a/target/linux/brcm63xx/dts/hg553.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG553";
-	compatible = "huawei,hg553", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg553", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts
index 018b913a88..1827e8e235 100644
--- a/target/linux/brcm63xx/dts/hg556a-a.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG556a (version A)";
-	compatible = "huawei,hg556a-a", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts
index 034e736f01..fa804bef9e 100644
--- a/target/linux/brcm63xx/dts/hg556a-b.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG556a (version B)";
-	compatible = "huawei,hg556a-b", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts
index 2e5aeb86e1..5ed847baab 100644
--- a/target/linux/brcm63xx/dts/hg556a-c.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG556a (version C)";
-	compatible = "huawei,hg556a-c", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226g.dts
index 44e297c08a..44e297c08a 100644
--- a/target/linux/brcm63xx/dts/a226g.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226g.dts
diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts
index bb1cd29359..bb1cd29359 100644
--- a/target/linux/brcm63xx/dts/a226m-fwb.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts
diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226m.dts
index e0a6b07697..e0a6b07697 100644
--- a/target/linux/brcm63xx/dts/a226m.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226m.dts
diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-agpf-s0.dts
index 0b9c397719..0b9c397719 100644
--- a/target/linux/brcm63xx/dts/agpf-s0.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-pirelli-agpf-s0.dts
diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts
index 33ad3ed82c..e1a3046c7f 100644
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "SFR Neuf Box 4 (Foxconn)";
-	compatible = "sfr,nb4-fxc-r1", "brcm,bcm6358";
+	compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts
index 86cd31be60..b28aaa3fe7 100644
--- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "SFR Neuf Box 4 (Sercomm)";
-	compatible = "sfr,nb4-ser-r0", "brcm,bcm6358";
+	compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
index 04bbb5a112..68f8588f55 100644
--- a/target/linux/brcm63xx/dts/spw303v.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "T-Com Speedport W303 V";
-	compatible = "t-com,spw303v", "brcm,bcm6358";
+	compatible = "t-com,speedport-w-303v", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/bcm6358-telsey-cpva642.dts
index e422912297..e422912297 100644
--- a/target/linux/brcm63xx/dts/cpva642.dts
+++ b/target/linux/brcm63xx/dts/bcm6358-telsey-cpva642.dts
diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts
index 293620664c..d1bf98a2b1 100644
--- a/target/linux/brcm63xx/dts/fast2504n.dts
+++ b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2504n";
-	compatible = "sagem,f@st2504n", "brcm,bcm6362";
+	compatible = "sagem,fast-2504n", "brcm,bcm6362";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts
index 202386a770..a5184ff555 100644
--- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "SFR neufbox 6 (Sercomm)";
-	compatible = "sfr,nb6-ser-r0", "brcm,bcm6362";
+	compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/bcm6368-actiontec-r1000h.dts
index 05198a1c9a..05198a1c9a 100644
--- a/target/linux/brcm63xx/dts/r1000h.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-actiontec-r1000h.dts
diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/bcm6368-adb-av4202n.dts
index df9dc718e1..df9dc718e1 100644
--- a/target/linux/brcm63xx/dts/av4202n.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-adb-av4202n.dts
diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts
index 3df15144e4..3df15144e4 100644
--- a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts
diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts
index 1004f88396..1004f88396 100644
--- a/target/linux/brcm63xx/dts/bcm96368MVWG.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts
diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
index 248ec1d73d..248ec1d73d 100644
--- a/target/linux/brcm63xx/dts/vr-3025u.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
index ac1f896434..ac1f896434 100644
--- a/target/linux/brcm63xx/dts/vr-3025un.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
index 8048d131a2..8048d131a2 100644
--- a/target/linux/brcm63xx/dts/vr-3026e.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts
index abf5ea4f6b..abf5ea4f6b 100644
--- a/target/linux/brcm63xx/dts/wap-5813n.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts
diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
index a7569a7808..36598645a3 100644
--- a/target/linux/brcm63xx/dts/hg622.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei HG622";
-	compatible = "huawei,hg622", "brcm,bcm6368";
+	compatible = "huawei,echolife-hg622", "brcm,bcm6368";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
index f62f238510..10fdcc6fd1 100644
--- a/target/linux/brcm63xx/dts/hg655b.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei HG655b";
-	compatible = "huawei,hg655b", "brcm,bcm6368";
+	compatible = "huawei,echolife-hg655b", "brcm,bcm6368";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
index b6aec06e6b..0354d8eddd 100644
--- a/target/linux/brcm63xx/dts/dgnd3700v1.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Netgear DGND3700v1/DGND3800B";
-	compatible = "netgear,dgnd3700v1", "brcm,bcm6368";
+	compatible = "netgear,dgnd3700-v1", "brcm,bcm6368";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts
index 1508291f4b..1508291f4b 100644
--- a/target/linux/brcm63xx/dts/evg2000.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts
diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/bcm6368-observa-vh4032n.dts
index 48f35b16e7..48f35b16e7 100644
--- a/target/linux/brcm63xx/dts/vh4032n.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-observa-vh4032n.dts
diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts
index c123832803..c123832803 100644
--- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
+++ b/target/linux/brcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts