ath79: reorganize DTSI for ar7240 TP-Link devices

The current set of TP-Link devices with ar7240 SoC all share
the same DTSI file. As the latter is very similar to the
definition required for the to-be-supported TP-Link TL-WA devices
with ar7240, this patch splits the definitions into a shared part
for all TP-Link devices (ar7240_tplink.dtsi) and a file containing
the specific setup for the present TL-WR devices
(ar7240_tplink_tl-wr.dtsi), equivalent to the former
ar7240_tplink_tl-wr74xn-v1.dtsi.

While at it, remove unused firmware partition label and rename
pinmux_switch_led_pins.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit 273e00c4a506c076dddfc51c3c00d4523496f5f4)

diff --git a/target/linux/ath79/dts/ar7240_tplink.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi
new file mode 100644 (file)
index 0000000..066cea4
--- /dev/null
+++ b/target/linux/ath79/dts/ar7240_tplink.dtsi
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar7240.dtsi"
+
+/ {
+       aliases {
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
+               poll-interval = <20>;
+
+               reset {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+
+               wps {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       leds: leds {
+               compatible = "gpio-leds";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinmux_switch_led_pins>;
+
+               led_system: system {
+                       label = "tp-link:green:system";
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+               };
+
+               qss {
+                       label = "tp-link:green:qss";
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       ath9k-leds {
+               compatible = "gpio-leds";
+
+               wlan {
+                       label = "tp-link:green:wlan";
+                       gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0tpt";
+               };
+       };
+};
+
+&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 {
+                               reg = <0x0 0x20000>;
+                               label = "u-boot";
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               compatible = "tplink,firmware";
+                               reg = <0x20000 0x3d0000>;
+                               label = "firmware";
+                       };
+
+                       art: partition@3f0000 {
+                               reg = <0x3f0000 0x10000>;
+                               label = "art";
+                               read-only;
+                       };
+               };
+       };
+};
+
+&eth1 {
+       status = "okay";
+};
+
+&pcie {
+       status = "okay";
+
+       ath9k: wifi@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               qca,no-eeprom;
+               mtd-mac-address = <&uboot 0x1fc00>;
+               #gpio-cells = <2>;
+               gpio-controller;
+       };
+};
+
+&pinmux {
+       pinmux_switch_led_pins: switch_led_pins {
+               pinctrl-single,bits = <0x0 0x0 0xf8>;
+       };
+};
+
+&uart {
+       status = "okay";
+};

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
new file mode 100644 (file)
index 0000000..7621b1d
--- /dev/null
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "ar7240_tplink.dtsi"
+
+&leds {
+       lan1 {
+               label = "tp-link:green:lan1";
+               gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+       };
+
+       lan2 {
+               label = "tp-link:green:lan2";
+               gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+       };
+
+       lan3 {
+               label = "tp-link:green:lan3";
+               gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+       };
+
+       lan4 {
+               label = "tp-link:green:lan4";
+               gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+       };
+
+       wan {
+               label = "tp-link:green:wan";
+               gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       mtd-mac-address = <&uboot 0x1fc00>;
+       mtd-mac-address-increment = <(-1)>;
+};
+
+&eth1 {
+       mtd-mac-address = <&uboot 0x1fc00>;
+       mtd-mac-address-increment = <1>;
+};
+
+&ath9k {
+       compatible = "pci168c,002b";
+};

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts
index be18fdd052bba2b634159cf89a993a8e078cff72..c49272bcb97e65965c3823caa552e39e73feb722 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7240_tplink_tl-wr74xn-v1.dtsi"
+#include "ar7240_tplink_tl-wr.dtsi"
 
 / {
        model = "TP-Link TL-WR740N v1/v2";

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts
index d0addda44a27ee8ee384f0bc37c1e04f4359b431..23867a252137691f92fe1c84ab6918c63422d343 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7240_tplink_tl-wr74xn-v1.dtsi"
+#include "ar7240_tplink_tl-wr.dtsi"
 
 / {
        model = "TP-Link TL-WR740N v3";

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts
index af9c90755914f6fad6095b918c052a6758840299..38d7f2af600be708fafe5d396619d4b13c2ffcda 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7240_tplink_tl-wr74xn-v1.dtsi"
+#include "ar7240_tplink_tl-wr.dtsi"
 
 / {
        model = "TP-Link TL-WR741N/ND v1/v2";

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts
index 2c55dff97e3d258ebe9a2230c852ec736a7e9c4d..6cfaa9905c88bd85acd0bd9818cd52bbadfee576 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7240_tplink_tl-wr74xn-v1.dtsi"
+#include "ar7240_tplink_tl-wr.dtsi"
 
 / {
        model = "TP-Link TL-WR743ND v1";

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi
deleted file mode 100644 (file)
index b7db74d..0000000
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi
+++ /dev/null
@@ -1,157 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar7240.dtsi"
-
-/ {
-       aliases {
-               led-boot = &led_system;
-               led-failsafe = &led_system;
-               led-running = &led_system;
-               led-upgrade = &led_system;
-       };
-
-       keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               wps {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-       };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&switch_led_pins>;
-
-               led_system: system {
-                       label = "tp-link:green:system";
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-               };
-
-               qss {
-                       label = "tp-link:green:qss";
-                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-               };
-
-               lan1 {
-                       label = "tp-link:green:lan1";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-               };
-
-               lan2 {
-                       label = "tp-link:green:lan2";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-
-               lan3 {
-                       label = "tp-link:green:lan3";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-               };
-
-               lan4 {
-                       label = "tp-link:green:lan4";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-               };
-
-               wan {
-                       label = "tp-link:green:wan";
-                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       ath9k-leds {
-               compatible = "gpio-leds";
-
-               wlan {
-                       label = "tp-link:green:wlan";
-                       gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
-};
-
-&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 {
-                               reg = <0x0 0x20000>;
-                               label = "u-boot";
-                               read-only;
-                       };
-
-                       firmware: partition@20000 {
-                               compatible = "tplink,firmware";
-                               reg = <0x20000 0x3d0000>;
-                               label = "firmware";
-                       };
-
-                       art: partition@3f0000 {
-                               reg = <0x3f0000 0x10000>;
-                               label = "art";
-                               read-only;
-                       };
-               };
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <(-1)>;
-};
-
-&eth1 {
-       status = "okay";
-
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <1>;
-};
-
-&pcie {
-       status = "okay";
-
-       ath9k: wifi@0,0 {
-               compatible = "pci168c,002b";
-               reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
-               mtd-mac-address = <&uboot 0x1fc00>;
-               #gpio-cells = <2>;
-               gpio-controller;
-       };
-};
-
-&pinmux {
-       switch_led_pins: pinmux_switch_led_pins {
-               pinctrl-single,bits = <0x0 0x0 0xf8>;
-       };
-};
-
-&uart {
-       status = "okay";
-};

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts
index e881821d6c60b82d47ef741ce477bec493053132..c030342d22679f0a606d0502679d4faea79448a9 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7240_tplink_tl-wr74xn-v1.dtsi"
+#include "ar7240_tplink_tl-wr.dtsi"
 
 / {
        model = "TP-Link TL-WR841N/ND v5/v6";

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts
index 8d844d54f7bdd23b06549670349ba7d44bf520d2..c8fe835e7eb22d824ad9846fc7acf1db68d001de 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7240_tplink_tl-wr74xn-v1.dtsi"
+#include "ar7240_tplink_tl-wr.dtsi"
 
 / {
        model = "TP-Link TL-WR941N/ND v4";