[v2,1/7] arm64: dts: rockchip: Drop unused rk3328-xhci node

Message ID 20230606170918.45581-2-jagan@amarulasolutions.com
State New
Headers show
Series
  • rockchip: Fix RK3328 USB support
Related show

Commit Message

Jagan Teki June 6, 2023, 5:09 p.m. UTC
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>
---
Changes for v2:
- none

 arch/arm/dts/rk3328-evb-u-boot.dtsi       |  5 -----
 arch/arm/dts/rk3328-roc-cc-u-boot.dtsi    | 14 --------------
 arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi |  5 -----
 arch/arm/dts/rk3328-rock64-u-boot.dtsi    | 15 ---------------
 arch/arm/dts/rk3328-u-boot.dtsi           | 11 -----------
 5 files changed, 50 deletions(-)

Comments

Kever Yang July 26, 2023, 10:59 a.m. UTC | #1
On 2023/6/7 01:09, Jagan Teki wrote:
> 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>

Thanks,
- Kever
> ---
> Changes for v2:
> - none
>
>   arch/arm/dts/rk3328-evb-u-boot.dtsi       |  5 -----
>   arch/arm/dts/rk3328-roc-cc-u-boot.dtsi    | 14 --------------
>   arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi |  5 -----
>   arch/arm/dts/rk3328-rock64-u-boot.dtsi    | 15 ---------------
>   arch/arm/dts/rk3328-u-boot.dtsi           | 11 -----------
>   5 files changed, 50 deletions(-)
>
> diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
> index 4bfa0c2330..f9c729d3bd 100644
> --- 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 27a454f017..2062f34bf8 100644
> --- 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 088e21c76a..1f220c6dcd 100644
> --- 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 c20a99a620..849854302e 100644
> --- 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 668f8ca29d..ce96ce40a7 100644
> --- 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 {

Patch

diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
index 4bfa0c2330..f9c729d3bd 100644
--- 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 27a454f017..2062f34bf8 100644
--- 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 088e21c76a..1f220c6dcd 100644
--- 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 c20a99a620..849854302e 100644
--- 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 668f8ca29d..ce96ce40a7 100644
--- 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 {