ath79: improve TP-Link CPE DTSI names for ar9344 SOC

The initial DTSI names for the TP-Link CPE devices have become
quite confusing, as several non-V1 devices now use the *-v1.dtsi,
the *cpe510-v1.dts does not use the cpe510.dtsi, etc.

This introduces a new naming scheme based on whether devices have
one or two ports, which should be easier to grasp.

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

12 files changed, 11 insertions, 11 deletions

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
index d002dfeb3c..d002dfeb3c 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts
index e82fd4a32f..95604f07c1 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx-v1.dtsi"
+#include "ar9344_tplink_cpe_2port.dtsi"
 
 / {
 	compatible = "tplink,cpe210-v1", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts
index 7e8822710f..4a737378b0 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx-v1.dtsi"
+#include "ar9344_tplink_cpe_2port.dtsi"
 
 / {
 	compatible = "tplink,cpe220-v2", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts
index 34b83c944e..483fdf4e6c 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx-v1.dtsi"
+#include "ar9344_tplink_cpe_2port.dtsi"
 
 / {
 	compatible = "tplink,cpe510-v1", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts
index 758d0c02f0..7348bf7553 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpe510.dtsi"
+#include "ar9344_tplink_cpe_1port.dtsi"
 
 / {
 	compatible = "tplink,cpe510-v2", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts b/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts
index 0909fcfa73..20a16c3d3e 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpe510.dtsi"
+#include "ar9344_tplink_cpe_1port.dtsi"
 
 / {
 	compatible = "tplink,cpe510-v3", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
index cb614a9dfb..54ea399b74 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx.dtsi"
+#include "ar9344_tplink_cpe.dtsi"
 
 / {
 	model = "TP-Link CPE610 v1";
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
index 41a9443740..653efdee17 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx.dtsi"
+#include "ar9344_tplink_cpe.dtsi"
 
 / {
 	aliases {
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
index 440ba8a8b3..e97e49d718 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx.dtsi"
+#include "ar9344_tplink_cpe.dtsi"
 
 / {
 	aliases {
diff --git a/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts b/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts
index dddf4aebda..8c5535754a 100644
--- a/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx-v1.dtsi"
+#include "ar9344_tplink_cpe_2port.dtsi"
 
 / {
 	compatible = "tplink,wbs210-v2", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts b/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts
index ba6fab2c1a..28ea727b3d 100644
--- a/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx-v1.dtsi"
+#include "ar9344_tplink_cpe_2port.dtsi"
 
 / {
 	compatible = "tplink,wbs510-v1", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts b/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts
index 5c55d78904..8ce47a5134 100644
--- a/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9344_tplink_cpexxx-v1.dtsi"
+#include "ar9344_tplink_cpe_2port.dtsi"
 
 / {
 	compatible = "tplink,wbs510-v2", "qca,ar9344";