ath79: drop tl prefix for TP-Link RE450 v2

This router is called RE450 and the tl prefix was used to identify it
as a TP-Link device. Drop the tl prefix since we now have tplink in
dts and device name.

Signed-off-by: Peter Lundkvist <peter.lundkvist@gmail.com>

diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
new file mode 100644 (file)
index 0000000..852f1c9
--- /dev/null
+++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
@@ -0,0 +1,191 @@
+// 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 "qca956x.dtsi"
+
+/ {
+       compatible = "tplink,re450-v2", "qca,qca9563";
+       model = "TP-Link RE450 v2";
+
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+       };
+
+       aliases {
+               led-status = &system;
+               mdio-gpio0 = &mdio2;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               system: power {
+                       label = "tp-link:blue:power";
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+               };
+
+               wlan2g {
+                       label = "tp-link:blue:wlan2g";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+                       linux,default-trigger = "phy1tpt";
+               };
+
+               wlan5g {
+                       label = "tp-link:blue:wlan5g";
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+                       linux,default-trigger = "phy0tpt";
+               };
+
+               lan_link {
+                       label = "tp-link:green:lan_link";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+
+               lan_data {
+                       label = "tp-link:green:lan_data";
+                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+
+               wps_blue {
+                       label = "tp-link:blue:wps";
+                       gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+
+               wps_red {
+                       label = "tp-link:red:wps";
+                       gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys";
+
+               reset {
+                       label = "Reset button";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+
+               power {
+                       label = "Power button";
+                       linux,code = <KEY_POWER>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+
+               leds {
+                       label = "LED control button";
+                       linux,code = <BTN_0>;
+                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+
+               wps {
+                       label = "WPS button";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       mdio2: mdio {
+               compatible = "virtual,mdio-gpio";
+
+               gpios = <&gpio 3 GPIO_ACTIVE_HIGH>, /* MDC */
+                       <&gpio 4 GPIO_ACTIVE_HIGH>; /* MDIO */
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               phy0: ethernet-phy@4 {
+                       reg = <4>;
+                       device_type = "ethernet-phy";
+                       reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&pcie {
+       status = "okay";
+};
+
+&uart {
+       status = "okay";
+};
+
+&gpio {
+       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>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x020000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "firmware";
+                               reg = <0x020000 0x5e0000>;
+                       };
+
+                       partition@600000 {
+                               label = "partition-table";
+                               reg = <0x600000 0x010000>;
+                               read-only;
+                       };
+
+                       info: partition@610000 {
+                               label = "product-info";
+                               reg = <0x610000 0x020000>;
+                               read-only;
+                       };
+
+                       partition@630000 {
+                               label = "config";
+                               reg = <0x630000 0x020000>;
+                               read-only;
+                       };
+
+                       art: partition@7f0000 {
+                               label = "art";
+                               reg = <0x7f0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&eth0 {
+       status = "okay";
+       mtd-mac-address = <&info 0x8>;
+       phy-handle = <&phy0>;
+};
+
+&wmac {
+       status = "okay";
+       mtd-cal-data = <&art 0x1000>;
+       mtd-mac-address = <&info 0x8>;
+};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts
deleted file mode 100644 (file)
index 852f1c9..0000000
--- a/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts
+++ /dev/null
@@ -1,191 +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 "qca956x.dtsi"
-
-/ {
-       compatible = "tplink,re450-v2", "qca,qca9563";
-       model = "TP-Link RE450 v2";
-
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
-       aliases {
-               led-status = &system;
-               mdio-gpio0 = &mdio2;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               system: power {
-                       label = "tp-link:blue:power";
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan2g {
-                       label = "tp-link:blue:wlan2g";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-                       linux,default-trigger = "phy1tpt";
-               };
-
-               wlan5g {
-                       label = "tp-link:blue:wlan5g";
-                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-                       linux,default-trigger = "phy0tpt";
-               };
-
-               lan_link {
-                       label = "tp-link:green:lan_link";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               lan_data {
-                       label = "tp-link:green:lan_data";
-                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               wps_blue {
-                       label = "tp-link:blue:wps";
-                       gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
-               };
-
-               wps_red {
-                       label = "tp-link:red:wps";
-                       gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "Reset button";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               power {
-                       label = "Power button";
-                       linux,code = <KEY_POWER>;
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               leds {
-                       label = "LED control button";
-                       linux,code = <BTN_0>;
-                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               wps {
-                       label = "WPS button";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-       };
-
-       mdio2: mdio {
-               compatible = "virtual,mdio-gpio";
-
-               gpios = <&gpio 3 GPIO_ACTIVE_HIGH>, /* MDC */
-                       <&gpio 4 GPIO_ACTIVE_HIGH>; /* MDIO */
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               phy0: ethernet-phy@4 {
-                       reg = <4>;
-                       device_type = "ethernet-phy";
-                       reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&pcie {
-       status = "okay";
-};
-
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       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>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x020000>;
-                               read-only;
-                       };
-
-                       partition@20000 {
-                               label = "firmware";
-                               reg = <0x020000 0x5e0000>;
-                       };
-
-                       partition@600000 {
-                               label = "partition-table";
-                               reg = <0x600000 0x010000>;
-                               read-only;
-                       };
-
-                       info: partition@610000 {
-                               label = "product-info";
-                               reg = <0x610000 0x020000>;
-                               read-only;
-                       };
-
-                       partition@630000 {
-                               label = "config";
-                               reg = <0x630000 0x020000>;
-                               read-only;
-                       };
-
-                       art: partition@7f0000 {
-                               label = "art";
-                               reg = <0x7f0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&eth0 {
-       status = "okay";
-       mtd-mac-address = <&info 0x8>;
-       phy-handle = <&phy0>;
-};
-
-&wmac {
-       status = "okay";
-       mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
-};

diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 0f8bfff8ad5b5d2b91fd26631bd6e5935693cc74..4c85099a1a6fc9e6f318ee1132c105e6683da893 100644 (file)
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -12,7 +12,7 @@ define Device/tplink_archer-c7-v2
 endef
 TARGET_DEVICES += tplink_archer-c7-v2
 
-define Device/tplink_tl-re450-v2
+define Device/tplink_re450-v2
   $(Device/tplink)
   ATH_SOC := qca9563
   IMAGE_SIZE := 6016k
@@ -27,7 +27,7 @@ define Device/tplink_tl-re450-v2
     append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
 endef
-TARGET_DEVICES += tplink_tl-re450-v2
+TARGET_DEVICES += tplink_re450-v2
 
 define Device/tplink_tl-wdr3600
   $(Device/tplink-8mlzma)