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_tl-mr10u.dtsi
similarity index 94%
rename from target/linux/ath79/dts/ar9331_tl-wr703n.dtsi
rename to target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
index 70f94ed4cb4825bc6f28ac72e267e1a4bdfb1a5a..8a82d80706ffa33248b1b9f8d5c5e5c054d76dab 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tl-wr703n.dtsi
+++ b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
@@ -7,9 +7,6 @@
 #include "ar9331.dtsi"
 
 / {
-       compatible = "tplink,tl-wr703n", "qca,ar9331";
-       model = "TP-Link TL-WR703N";
-
        aliases {
                serial0 = &uart;
                led-status = &led_system;
@@ -48,7 +45,6 @@
                regulator-name = "usb_vbus";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
-               gpio = <&gpio 8 GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };