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>

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
similarity index 100%
rename from target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi
rename to 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 e82fd4a32f6920b3122727585e6f0e13c1614cf1..95604f07c192d6053dbd48e9c78c7ca175919d07 100644 (file)
--- 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 7e8822710fca18b1e1499a43ed9cc6aec2424c2c..4a737378b0799726e00497e31071e769c469616f 100644 (file)
--- 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 34b83c944e6749eef68a4c7e3b0112bcc9cdfa83..483fdf4e6c2fe0abbed6e9b38aa3578a5f24ee4c 100644 (file)
--- 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 758d0c02f0e5c400a60db996a9303cf16d741e86..7348bf7553f439c7aa60adad31d133218122c08d 100644 (file)
--- 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 0909fcfa733bd44eb29cf0d8222e2cca2f02b6aa..20a16c3d3ec92fd62eb806bb7c7f0dc2b609eb0b 100644 (file)
--- 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 cb614a9dfb1fa08a7ee4ea65a90e62aeed9595be..54ea399b7454a9317d133bb9522d47da3855a997 100644 (file)
--- 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
similarity index 95%
rename from target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi
rename to target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
index 41a944374084a49e552b4d43f383abc913988d5a..653efdee1739390f29838c1001ecf3a58007e76b 100644 (file)
--- 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
similarity index 96%
rename from target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi
rename to target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
index 440ba8a8b364c102e7fc3f705c3b3f52b6b962b1..e97e49d718b04819fdd6f7b32d01ee61b4fad2d0 100644 (file)
--- 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 dddf4aebdaf878213316c111fa83b7233e7b6686..8c5535754a2456732816b71ed81d8d416b1cfad8 100644 (file)
--- 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 ba6fab2c1af7e3ade46e0ee74dd9c3da31e8710e..28ea727b3d66c90359684764808629a3959ca316 100644 (file)
--- 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 5c55d789041ce631fc389bbf7f5221e34aeceb6d..8ce47a51345e7adb912a1d17a48d650138771de2 100644 (file)
--- 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";