Revert "arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub"

This reverts commit 1da8116eb0c5dfc05cfb89896239badb18c4daf3.

It causes merge issues with linux-next, and there are larger build
problems overall with this patch series, so the whole thing is being
reverted for now.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20210617144346.564be887@canb.auug.org.au
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
index bae85f6..5c997cd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
@@ -23,6 +23,17 @@
        status = "disabled";
 };
 
+&pp3300_hub {
+       /* pp3300_l7c is used to power the USB hub */
+       /delete-property/regulator-always-on;
+       /delete-property/regulator-boot-on;
+};
+
+&pp3300_l7c {
+       regulator-always-on;
+       regulator-boot-on;
+};
+
 &sn65dsi86_out {
        /*
         * Lane 0 was incorrectly mapped on the cable, but we've now decided
@@ -31,11 +42,3 @@
         */
        lane-polarities = <1 0>;
 };
-
-&usb_hub_2_0 {
-        vdd-supply = <&pp3300_l7c>;
-};
-
-&usb_hub_3_0 {
-        vdd-supply = <&pp3300_l7c>;
-};

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
index 343ed45..d9fbcc7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
@@ -23,11 +23,13 @@
        status = "disabled";
 };
 
-
-&usb_hub_2_0 {
-        vdd-supply = <&pp3300_l7c>;
+&pp3300_hub {
+       /* pp3300_l7c is used to power the USB hub */
+       /delete-property/regulator-always-on;
+       /delete-property/regulator-boot-on;
 };
 
-&usb_hub_3_0 {
-        vdd-supply = <&pp3300_l7c>;
+&pp3300_l7c {
+       regulator-always-on;
+       regulator-boot-on;
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
index 2f5263e..2b522f9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -42,20 +42,23 @@ ap_ts_pen_1v8: &i2c4 {
        compatible = "auo,b116xa01";
 };
 
-&sdhc_2 {
-       status = "okay";
+&pp3300_hub {
+       /* pp3300_l7c is used to power the USB hub */
+       /delete-property/regulator-always-on;
+       /delete-property/regulator-boot-on;
 };
 
-&trackpad {
-       interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
+&pp3300_l7c {
+       regulator-always-on;
+       regulator-boot-on;
 };
 
-&usb_hub_2_0 {
-        vdd-supply = <&pp3300_l7c>;
+&sdhc_2 {
+       status = "okay";
 };
 
-&usb_hub_3_0 {
-        vdd-supply = <&pp3300_l7c>;
+&trackpad {
+       interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
 };
 
 /* PINCTRL - modifications to sc7180-trogdor.dtsi */

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 0436418..24d293e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -207,6 +207,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&en_pp3300_hub>;
 
+               regulator-always-on;
                regulator-boot-on;
 
                vin-supply = <&pp3300_a>;
@@ -905,24 +906,6 @@ ap_spi_fp: &spi10 {
 
 &usb_1_dwc3 {
        dr_mode = "host";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       /* 2.0 hub on port 1 */
-       usb_hub_2_0: hub@1 {
-               compatible = "usbbda,5411";
-               reg = <1>;
-               vdd-supply = <&pp3300_hub>;
-               companion-hub = <&usb_hub_3_0>;
-       };
-
-       /* 3.0 hub on port 2 */
-       usb_hub_3_0: hub@2 {
-               compatible = "usbbda,411";
-               reg = <2>;
-               vdd-supply = <&pp3300_hub>;
-               companion-hub = <&usb_hub_2_0>;
-       };
 };
 
 &usb_1_hsphy {