ipq8064: enable 2nd USB port on R7500

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@reifferscheid.org>

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 1c26343d935a4622e72650c48cc23d87c28b614c..b31f34cc65beb0d4b4dcf2f9b64cef4bc534c10f 100644 (file)
--- 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 2c7ba5acc148962b3b295f80f659bf29a1f6b76a..9996bd74151a3db1d9516a178e07e6470b134373 100644 (file)
--- 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
@@ -965,8 +965,6 @@
                        clocks = <&gcc USB30_0_MASTER_CLK>;
                        clock-names = "core";
 
-                       syscon-tcsr = <&tcsr 0xb0 1>;
-
                        ranges;
 
                        status = "disabled";
@@ -989,8 +987,6 @@
                        clocks = <&gcc USB30_1_MASTER_CLK>;
                        clock-names = "core";
 
-                       syscon-tcsr = <&tcsr 0xb0 0>;
-
                        ranges;
 
                        status = "disabled";