[LEDE-DEV] [PATCH] ipq8064: enable 2nd USB port on R7500

[Thomas Reifferscheid]

Makes use of the syscon tcsr and enables both USB ports. Cleans up
qcom-ipq8064.dtsi from previous attempts.

Fixes FS#497

Signed-off-by: Thomas Reifferscheid <thomas at reifferscheid.org>
---
 .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500.dts      | 6 ++++++
 target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi  | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 1c26343..b31f34c 100644
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v1.0.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
 	model = "Netgear Nighthawk X4 R7500";
@@ -376,6 +377,11 @@
 	};
 };
 
+&tcsr {
+	qcom,usb-ctrl-select = <TCSR_USB_SELECT_USB3_DUAL>;
+	compatible = "qcom,tcsr";
+};
+
 &adm_dma {
 	status = "ok";
 };
diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 3893f45..c94a77c 100644
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -692,8 +692,6 @@
 			clocks = <&gcc USB30_0_MASTER_CLK>;
 			clock-names = "core";
 
-			syscon-tcsr = <&tcsr 0xb0 1>;
-
 			ranges;
 
 			status = "disabled";
@@ -716,8 +714,6 @@
 			clocks = <&gcc USB30_1_MASTER_CLK>;
 			clock-names = "core";
 
-			syscon-tcsr = <&tcsr 0xb0 0>;
-
 			ranges;
 
 			status = "disabled";
-- 
2.1.4