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_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
new file mode 100644 (file)
index 0000000..d002dfe
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar9344.dtsi"
+
+/ {
+       aliases {
+               label-mac-device = &wmac;
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+};
+
+&ref {
+       clock-frequency = <40000000>;
+};
+
+&uart {
+       status = "okay";
+};
+
+&spi {
+       status = "okay";
+
+       num-cs = <1>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       uboot: partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x020000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "partition-table";
+                               reg = <0x020000 0x010000>;
+                               read-only;
+                       };
+
+                       info: partition@30000 {
+                               label = "info";
+                               reg = <0x030000 0x010000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "firmware";
+                               reg = <0x040000 0x780000>;
+
+                               compatible = "fixed-partitions";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               partition@0 {
+                                       label = "kernel";
+                                       reg = <0x000000 0x200000>;
+                               };
+
+                               partition@200000 {
+                                       label = "rootfs";
+                                       reg = <0x200000 0x580000>;
+                               };
+                       };
+
+                       partition@7c0000 {
+                               label = "config";
+                               reg = <0x7c0000 0x030000>;
+                               read-only;
+                       };
+
+                       art: partition@7f0000 {
+                               label = "art";
+                               reg = <0x7f0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&wmac {
+       status = "okay";
+
+       mtd-cal-data = <&art 0x1000>;
+       mtd-mac-address = <&info 0x08>;
+};
+
+&eth0 {
+       status = "okay";
+
+       phy-handle = <&swphy4>;
+
+       mtd-mac-address = <&info 0x8>;
+};

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_cpe510.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi
deleted file mode 100644 (file)
index 41a9443..0000000
--- a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi
+++ /dev/null
@@ -1,48 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar9344_tplink_cpexxx.dtsi"
-
-/ {
-       aliases {
-               led-boot = &led_system;
-               led-failsafe = &led_system;
-               led-running = &led_system;
-               led-upgrade = &led_system;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               lan {
-                       label = "tp-link:green:lan";
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-               };
-
-               link1 {
-                       label = "tp-link:green:link1";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-               };
-
-               link2 {
-                       label = "tp-link:green:link2";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-
-               link3 {
-                       label = "tp-link:green:link3";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-               };
-
-               led_system: link4 {
-                       label = "tp-link:green:link4";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&eth1 {
-       status = "okay";
-
-       compatible = "syscon", "simple-mfd";
-};

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_cpe_1port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
new file mode 100644 (file)
index 0000000..653efde
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar9344_tplink_cpe.dtsi"
+
+/ {
+       aliases {
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               lan {
+                       label = "tp-link:green:lan";
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+               };
+
+               link1 {
+                       label = "tp-link:green:link1";
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+               };
+
+               link2 {
+                       label = "tp-link:green:link2";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+               };
+
+               link3 {
+                       label = "tp-link:green:link3";
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+               };
+
+               led_system: link4 {
+                       label = "tp-link:green:link4";
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&eth1 {
+       status = "okay";
+
+       compatible = "syscon", "simple-mfd";
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
new file mode 100644 (file)
index 0000000..e97e49d
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar9344_tplink_cpe.dtsi"
+
+/ {
+       aliases {
+               led-boot = &led_link4;
+               led-failsafe = &led_link4;
+               led-running = &led_link4;
+               led-upgrade = &led_link4;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               lan0 {
+                       label = "tp-link:green:lan0";
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+               };
+
+               lan1 {
+                       label = "tp-link:green:lan1";
+                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+               };
+
+               link1 {
+                       label = "tp-link:green:link1";
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+               };
+
+               link2 {
+                       label = "tp-link:green:link2";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+               };
+
+               link3 {
+                       label = "tp-link:green:link3";
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+               };
+
+               led_link4: link4 {
+                       label = "tp-link:green:link4";
+               };
+       };
+};
+
+&gpio {
+       gpio_ext_lna0 {
+               gpio-hog;
+               gpios = <18 0>;
+               output-high;
+               line-name = "tp-link:ext:lna0";
+       };
+
+       gpio_ext_lna1 {
+               gpio-hog;
+               gpios = <19 0>;
+               output-high;
+               line-name = "tp-link:ext:lna1";
+       };
+};
+
+&eth1 {
+       status = "okay";
+
+       mtd-mac-address = <&info 0x8>;
+
+       gmac-config {
+               device = <&gmac>;
+               switch-phy-swap = <0>;
+               switch-only-mode = <1>;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi
deleted file mode 100644 (file)
index 440ba8a..0000000
--- a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi
+++ /dev/null
@@ -1,74 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar9344_tplink_cpexxx.dtsi"
-
-/ {
-       aliases {
-               led-boot = &led_link4;
-               led-failsafe = &led_link4;
-               led-running = &led_link4;
-               led-upgrade = &led_link4;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               lan0 {
-                       label = "tp-link:green:lan0";
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-               };
-
-               lan1 {
-                       label = "tp-link:green:lan1";
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-               };
-
-               link1 {
-                       label = "tp-link:green:link1";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-               };
-
-               link2 {
-                       label = "tp-link:green:link2";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-
-               link3 {
-                       label = "tp-link:green:link3";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-               };
-
-               led_link4: link4 {
-                       label = "tp-link:green:link4";
-               };
-       };
-};
-
-&gpio {
-       gpio_ext_lna0 {
-               gpio-hog;
-               gpios = <18 0>;
-               output-high;
-               line-name = "tp-link:ext:lna0";
-       };
-
-       gpio_ext_lna1 {
-               gpio-hog;
-               gpios = <19 0>;
-               output-high;
-               line-name = "tp-link:ext:lna1";
-       };
-};
-
-&eth1 {
-       status = "okay";
-
-       mtd-mac-address = <&info 0x8>;
-
-       gmac-config {
-               device = <&gmac>;
-               switch-phy-swap = <0>;
-               switch-only-mode = <1>;
-       };
-};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi
deleted file mode 100644 (file)
index d002dfe..0000000
--- a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi
+++ /dev/null
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar9344.dtsi"
-
-/ {
-       aliases {
-               label-mac-device = &wmac;
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-       };
-};
-
-&ref {
-       clock-frequency = <40000000>;
-};
-
-&uart {
-       status = "okay";
-};
-
-&spi {
-       status = "okay";
-
-       num-cs = <1>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       uboot: partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x020000>;
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               label = "partition-table";
-                               reg = <0x020000 0x010000>;
-                               read-only;
-                       };
-
-                       info: partition@30000 {
-                               label = "info";
-                               reg = <0x030000 0x010000>;
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               label = "firmware";
-                               reg = <0x040000 0x780000>;
-
-                               compatible = "fixed-partitions";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partition@0 {
-                                       label = "kernel";
-                                       reg = <0x000000 0x200000>;
-                               };
-
-                               partition@200000 {
-                                       label = "rootfs";
-                                       reg = <0x200000 0x580000>;
-                               };
-                       };
-
-                       partition@7c0000 {
-                               label = "config";
-                               reg = <0x7c0000 0x030000>;
-                               read-only;
-                       };
-
-                       art: partition@7f0000 {
-                               label = "art";
-                               reg = <0x7f0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&wmac {
-       status = "okay";
-
-       mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x08>;
-};
-
-&eth0 {
-       status = "okay";
-
-       phy-handle = <&swphy4>;
-
-       mtd-mac-address = <&info 0x8>;
-};

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";