[OpenWrt-Devel] ath79: fixup TL-WR703N/TL-MR10U split

Message ID 20180612205452.29857-1-monkeh@monkeh.net
State Accepted
Delegated to: John Crispin
Headers show
Series
  • [OpenWrt-Devel] ath79: fixup TL-WR703N/TL-MR10U split
Related show

Commit Message

Alex Maclean June 12, 2018, 8:54 p.m.
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>
---
 target/linux/ath79/dts/ar9331_tl-mr10u.dts     | 18 ++++++------------
 target/linux/ath79/dts/ar9331_tl-wr703n.dts    | 10 +++++++---
 ...03n.dtsi => ar9331_tl-wr703n_tl-mr10u.dtsi} |  4 ----
 3 files changed, 13 insertions(+), 19 deletions(-)
 rename target/linux/ath79/dts/{ar9331_tl-wr703n.dtsi => ar9331_tl-wr703n_tl-mr10u.dtsi} (94%)

Comments

Mathias Kresin June 16, 2018, 8:14 a.m. | #1
12.06.2018 22:54, Alex Maclean:
> 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>

Merged, thanks!

Would be anyone so kind to set the patch status to accepted in patchwork.

Mathias

Patch

diff --git a/target/linux/ath79/dts/ar9331_tl-mr10u.dts b/target/linux/ath79/dts/ar9331_tl-mr10u.dts
index 9a6947c951..d92b5623ba 100644
--- 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 17747052e6..da02e48662 100644
--- 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 70f94ed4cb..8a82d80706 100644
--- 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;
 	};