ath79: fixup TL-WR703N/TL-MR10U split

Readd SoC compatible strings and correct model names mangled in
a51078f7354fac9e31f6956cbddc77aaef02c67b, cleanup dts to remove
duplication, rename dtsi for clarity, use correct GPIO for TL-MR10U
USB power.

Tested only on TL-WR703N due to lack of a TL-MR10U.

Signed-off-by: Alex Maclean <monkeh@monkeh.net>

diff --git a/target/linux/ath79/dts/ar9331_tl-mr10u.dts b/target/linux/ath79/dts/ar9331_tl-mr10u.dts
index 9a6947c9513d8319895455759041cc9ed979ce1d..d92b5623ba61507130dd7c476dc5ed29eecbae65 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tl-mr10u.dts
+++ b/target/linux/ath79/dts/ar9331_tl-mr10u.dts
@@ -1,19 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9331_tl-wr703n.dtsi"
+#include "ar9331_tl-wr703n_tl-mr10u.dtsi"
 
 / {
-       model = "TP-Link MR10U";
-       compatible = "tplink,tl-mr10u";
-
-       reg_usb_vbus: reg_usb_vbus {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio 28 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
+       model = "TP-Link TL-MR10U";
+       compatible = "tplink,tl-mr10u", "qca,ar9331";
+};
 
+&reg_usb_vbus {
+       gpio = <&gpio 18 GPIO_ACTIVE_HIGH>;
 };

diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n.dts b/target/linux/ath79/dts/ar9331_tl-wr703n.dts
index 17747052e6eca6f47cb927970e792d7f7d51ce49..da02e486624a0dcab2e499eec268d01e5ab624e9 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tl-wr703n.dts
+++ b/target/linux/ath79/dts/ar9331_tl-wr703n.dts
@@ -1,9 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar9331_tl-wr703n.dtsi"
+#include "ar9331_tl-wr703n_tl-mr10u.dtsi"
 
 / {
-       model = "TP-Link WR703N";
-       compatible = "tplink,tl-wr703n";
+       model = "TP-Link TL-WR703N";
+       compatible = "tplink,tl-wr703n", "qca,ar9331";
+};
+
+&reg_usb_vbus {
+       gpio = <&gpio 8 GPIO_ACTIVE_HIGH>;
 };

diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n.dtsi b/target/linux/ath79/dts/ar9331_tl-wr703n.dtsi
deleted file mode 100644 (file)
index 70f94ed..0000000
--- a/target/linux/ath79/dts/ar9331_tl-wr703n.dtsi
+++ /dev/null
@@ -1,139 +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 "ar9331.dtsi"
-
-/ {
-       compatible = "tplink,tl-wr703n", "qca,ar9331";
-       model = "TP-Link TL-WR703N";
-
-       aliases {
-               serial0 = &uart;
-               led-status = &led_system;
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x2000000>;
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <20>;
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-       };
-       
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               led_system: system {
-                       label = "tl-wr703n:blue:system";
-                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       reg_usb_vbus: reg_usb_vbus {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio 8 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
-};
-
-&spi {
-       status = "okay";
-       num-cs = <1>;
-
-       flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               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 {
-                               reg = <0x20000 0x3d0000>;
-                               label = "firmware";
-                       };
-
-                       art: partition@3f0000 {
-                               reg = <0x3f0000 0x10000>;
-                               label = "art";
-                               read-only;
-                       };
-               };
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       phy-handle = <&phy4>;
-
-       mtd-mac-address = <&uboot 0x1fc00>;
-
-       gmac-config {
-               device = <&gmac>;
-
-               switch-phy-addr-swap = <0>;
-               switch-phy-swap = <0>;
-       };
-};
-
-&gpio {
-       status = "okay";
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&usb {
-       dr_mode = "host";
-       vbus-supply = <&reg_usb_vbus>;
-       status = "okay";
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&wmac {
-       status = "okay";
-       mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
-};

diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
new file mode 100644 (file)
index 0000000..8a82d80
--- /dev/null
+++ b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
@@ -0,0 +1,135 @@
+// 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 "ar9331.dtsi"
+
+/ {
+       aliases {
+               serial0 = &uart;
+               led-status = &led_system;
+       };
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x2000000>;
+       };
+
+       gpio-keys-polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <20>;
+
+               reset {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+       
+       gpio-leds {
+               compatible = "gpio-leds";
+
+               led_system: system {
+                       label = "tl-wr703n:blue:system";
+                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       reg_usb_vbus: reg_usb_vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+       };
+
+};
+
+&spi {
+       status = "okay";
+       num-cs = <1>;
+
+       flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               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 {
+                               reg = <0x20000 0x3d0000>;
+                               label = "firmware";
+                       };
+
+                       art: partition@3f0000 {
+                               reg = <0x3f0000 0x10000>;
+                               label = "art";
+                               read-only;
+                       };
+               };
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       phy-handle = <&phy4>;
+
+       mtd-mac-address = <&uboot 0x1fc00>;
+
+       gmac-config {
+               device = <&gmac>;
+
+               switch-phy-addr-swap = <0>;
+               switch-phy-swap = <0>;
+       };
+};
+
+&gpio {
+       status = "okay";
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               phy-mode = "mii";
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&usb {
+       dr_mode = "host";
+       vbus-supply = <&reg_usb_vbus>;
+       status = "okay";
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&wmac {
+       status = "okay";
+       mtd-cal-data = <&art 0x1000>;
+       mtd-mac-address = <&uboot 0x1fc00>;
+};