arm64: dts: rockchip: Drop unused rk3328-xhci node

rk3328-xhci has been added due to the fact that the upstream
dwc3 is unsupported. Moreover, the driver for rk3328-xhci is
not added to the code tree.

By considering these facts and unsupported rk3328-xhci this
patch is dropping all related code from DT. However, the DWC3
is fixed now in dwc3-generic and RK3328 USB 3.0 is functional
in upcoming patches.

Let's drop it.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
index 95e4979..12b68df 100644 (file)
--- a/arch/arm/dts/rk3328-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi
@@ -44,8 +44,3 @@
        /* Integrated PHY unsupported by U-Boot */
        status = "broken";
 };
-
-&usb_host0_xhci {
-       vbus-supply = <&vcc5v0_host_xhci>;
-       status = "okay";
-};

diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
index 27a454f..2062f34 100644 (file)
--- a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
@@ -48,20 +48,6 @@
        bootph-pre-ram;
 };
 
-&usb_host0_xhci {
-       vbus-supply = <&vcc_host1_5v>;
-       status = "okay";
-};
-
-/*
- * This makes XHCI responsible for toggling VBUS. This is needed to work
- * around an issue where either XHCI only works with USB 2.0 or OTG doesn't
- * work, depending on how VBUS is configured. Having USB 3.0 seems better.
- */
-&vcc_host1_5v {
-       /delete-property/ regulator-always-on;
-};
-
 /* Need this and all the pinctrl/gpio stuff above to set pinmux */
 &vcc_sd {
        bootph-pre-ram;

diff --git a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
index 088e21c..1f220c6 100644 (file)
--- a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
@@ -45,11 +45,6 @@
        bootph-pre-ram;
 };
 
-&usb_host0_xhci {
-       vbus-supply = <&vcc_host_5v>;
-       status = "okay";
-};
-
 /* Need this and all the pinctrl/gpio stuff above to set pinmux */
 &vcc_sd {
        bootph-pre-ram;

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index c20a99a..8498543 100644 (file)
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -48,21 +48,6 @@
        bootph-pre-ram;
 };
 
-&usb_host0_xhci {
-       vbus-supply = <&vcc_host_5v>;
-       status = "okay";
-};
-
-/*
- * This makes XHCI responsible for toggling VBUS. This is needed to work
- * around an issue where either XHCI only works with USB 2.0 or OTG doesn't
- * work, depending on how VBUS is configured. Having USB 3.0 seems better.
- */
-&vcc_host_5v {
-       /delete-property/ regulator-always-on;
-       /delete-property/ regulator-boot-on;
-};
-
 /* Need this and all the pinctrl/gpio stuff above to set pinmux */
 &vcc_sd {
        bootph-pre-ram;

diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index 668f8ca..ce96ce4 100644 (file)
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -26,17 +26,6 @@
                       0x0 0xff720000 0x0 0x1000
                       0x0 0xff798000 0x0 0x1000>;
        };
-
-       usb_host0_xhci: usb@ff600000 {
-               compatible = "rockchip,rk3328-xhci";
-               reg = <0x0 0xff600000 0x0 0x100000>;
-               interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
-               snps,dis-enblslpm-quirk;
-               snps,phyif-utmi-bits = <16>;
-               snps,dis-u2-freeclk-exists-quirk;
-               snps,dis-u2-susphy-quirk;
-               status = "disabled";
-       };
 };
 
 &cru {