diff mbox series

[1/2] arm64: dts: rockchip: add the usb3 nodes to rk356x

Message ID 20220225100943.2115933-2-michael.riesch@wolfvision.net (mailing list archive)
State New
Headers show
Series arm64: dts: rockchip: add usb3 support to rk356x | expand

Commit Message

Michael Riesch Feb. 25, 2022, 10:09 a.m. UTC
The Rockchip RK3566 and RK3568 feature two USB 3.0 xHCI controllers,
one of them with Dual Role Device (DRD) capability.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 arch/arm64/boot/dts/rockchip/rk3568.dtsi |  5 ++
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 58 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

Comments

Johan Jonker Feb. 25, 2022, 10:53 a.m. UTC | #1
Hi Michael,

On 2/25/22 11:09, Michael Riesch wrote:
> The Rockchip RK3566 and RK3568 feature two USB 3.0 xHCI controllers,
> one of them with Dual Role Device (DRD) capability.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
> ---
>  arch/arm64/boot/dts/rockchip/rk3568.dtsi |  5 ++
>  arch/arm64/boot/dts/rockchip/rk356x.dtsi | 58 ++++++++++++++++++++++++
>  2 files changed, 63 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> index 91a0b798b857..0cd4ef36066a 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> @@ -116,3 +116,8 @@ power-domain@RK3568_PD_PIPE {
>  		#power-domain-cells = <0>;
>  	};
>  };
> +
> +&usb_host0_dwc3 {
> +	phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;
> +	phy-names = "usb2-phy", "usb3-phy";
> +};
> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> index 8b9fae3d348a..b46794486037 100644
> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> @@ -230,6 +230,64 @@ scmi_shmem: sram@0 {
>  		};
>  	};
>  
> +	usb_host0_xhci: usb@fcc00000 {

> +		compatible = "rockchip,rk3399-dwc3";

Add string to rockchip,dwc3.yaml
and check with dtsb_check

compatible = "rockchip,rk3399-dwc3", "snps,dwc3";

> +		#address-cells = <2>;

remove

> +		clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>,

> +			 <&cru ACLK_USB3OTG0>, <&cru PCLK_PIPE>;

PCLK_PIPE part of an other node, probably only to enable PD_PIPE.

	combphy1: phy@fe830000 {
		compatible = "rockchip,rk3568-naneng-combphy";
		reg = <0x0 0xfe830000 0x0 0x100>;
		clocks = <&pmucru CLK_PCIEPHY1_REF>,
			 <&cru PCLK_PIPEPHY1>,
			 <&cru PCLK_PIPE>;
		clock-names = "ref", "apb", "pipe";
		assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;
		assigned-clock-rates = <100000000>;
		resets = <&cru SRST_PIPEPHY1>;
		rockchip,pipe-grf = <&pipegrf>;
		rockchip,pipe-phy-grf = <&pipe_phy_grf1>;
		#phy-cells = <1>;
		status = "disabled";
	};

Rockchip RK3568 TRM Part1 V1.0-20210111.pdf
page 475

PD_PIPE:

BIU_PIPE
USB3OTG
PCIE20
PCIE30
SATA
XPCS

PCIE, SATA USB clocks are child of aclk_pipe
Yet PCLK_PIPE is the only clock that enables RK3568_PD_PIPE.


	COMPOSITE_NOMUX(PCLK_PIPE, "pclk_pipe", "aclk_pipe", 0,
			RK3568_CLKSEL_CON(29), 4, 4, DFLAGS,
			RK3568_CLKGATE_CON(10), 1, GFLAGS),

&power {
	power-domain@RK3568_PD_PIPE {
		reg = <RK3568_PD_PIPE>;

		clocks = <&cru PCLK_PIPE>;

Do we need more clocks here for USB for example?

		pm_qos = <&qos_pcie2x1>,
			 <&qos_pcie3x1>,
			 <&qos_pcie3x2>,
			 <&qos_sata0>,
			 <&qos_sata1>,
			 <&qos_sata2>,
			 <&qos_usb3_0>,
			 <&qos_usb3_1>;
		#power-domain-cells = <0>;
	};
};

> +		clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk";

grf_clk only related to rk3399 ACLK_USB3_GRF and not to PCLK_PIPE.

> +		ranges;
> +		#size-cells = <2>;

remove

> +		status = "disabled";
> +
> +		usb_host0_dwc3: usb@fcc00000 {

No subnode for "snps,dwc3"
No more subdriver like rk3399.
Use dwc core only and fix things/quirks there.

> +			compatible = "snps,dwc3";
> +			reg = <0x0 0xfcc00000 0x0 0x400000>;
> +			interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
> +			dr_mode = "otg";
> +			phy_type = "utmi_wide";
> +			power-domains = <&power RK3568_PD_PIPE>;
> +			resets = <&cru SRST_USB3OTG0>;
> +			reset-names = "usb3-otg";
> +			snps,dis-del-phy-power-chg-quirk;
> +			snps,dis_enblslpm_quirk;
> +			snps,dis_rxdet_inp3_quirk;
> +			snps,dis-tx-ipgap-linecheck-quirk;
> +			snps,dis-u2-freeclk-exists-quirk;

> +			snps,xhci-trb-ent-quirk;

Not in mainline.
See snps,dwc3.yaml

> +		};
> +	};
> +
> +	usb_host1_xhci: usb@fd000000 {
> +		compatible = "rockchip,rk3399-dwc3";
> +		#address-cells = <2>;
> +		clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>,
> +			 <&cru ACLK_USB3OTG1>, <&cru PCLK_PIPE>;
> +		clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk";
> +		ranges;
> +		#size-cells = <2>;
> +		status = "disabled";
> +
> +		usb_host1_dwc3: usb@fd000000 {
> +			compatible = "snps,dwc3";
> +			reg = <0x0 0xfd000000 0x0 0x400000>;
> +			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
> +			dr_mode = "host";
> +			phy_type = "utmi_wide";
> +			phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
> +			phy-names = "usb2-phy", "usb3-phy";
> +			power-domains = <&power RK3568_PD_PIPE>;
> +			resets = <&cru SRST_USB3OTG1>;

> +			reset-names = "usb3-host";

  reset-names:
    const: usb3-otg

Fix binding or DT ??

> +			snps,dis-del-phy-power-chg-quirk;
> +			snps,dis_enblslpm_quirk;
> +			snps,dis_rxdet_inp3_quirk;
> +			snps,dis-tx-ipgap-linecheck-quirk;
> +			snps,dis-u2-freeclk-exists-quirk;

> +			snps,xhci-trb-ent-quirk;

Not in mainline ??

> +		};
> +	};
> +


	usbdrd3_1: usb@fd000000 {
		compatible = "rockchip,rk3399-dwc3", "snps,dwc3";
		reg = <0x0 0xfd000000 0x0 0x400000>;
		interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&cru CLK_USB3OTG1_REF>,
			 <&cru CLK_USB3OTG1_SUSPEND>,
			 <&cru ACLK_USB3OTG1>;
		clock-names = "ref_clk", "suspend_clk", "bus_clk";
		dr_mode = "host";
		phy_type = "utmi_wide";
		phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
		phy-names = "usb2-phy", "usb3-phy";
		power-domains = <&power RK3568_PD_PIPE>;
		resets = <&cru SRST_USB3OTG1>;
		reset-names = "usb3-otg";
		snps,dis-del-phy-power-chg-quirk;
		snps,dis_enblslpm_quirk;
		snps,dis_rxdet_inp3_quirk;
		snps,dis-tx-ipgap-linecheck-quirk;
		snps,dis-u2-freeclk-exists-quirk;
		status = "disabled";
	};


>  	gic: interrupt-controller@fd400000 {
>  		compatible = "arm,gic-v3";
>  		reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
Johan Jonker Feb. 25, 2022, 11:04 a.m. UTC | #2
Oops...

On 2/25/22 11:53, Johan Jonker wrote:
> Hi Michael,
> 
> On 2/25/22 11:09, Michael Riesch wrote:
>> The Rockchip RK3566 and RK3568 feature two USB 3.0 xHCI controllers,
>> one of them with Dual Role Device (DRD) capability.
>>
>> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
>> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
>> ---
>>  arch/arm64/boot/dts/rockchip/rk3568.dtsi |  5 ++
>>  arch/arm64/boot/dts/rockchip/rk356x.dtsi | 58 ++++++++++++++++++++++++
>>  2 files changed, 63 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> index 91a0b798b857..0cd4ef36066a 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> @@ -116,3 +116,8 @@ power-domain@RK3568_PD_PIPE {
>>  		#power-domain-cells = <0>;
>>  	};
>>  };
>> +
>> +&usb_host0_dwc3 {
>> +	phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;
>> +	phy-names = "usb2-phy", "usb3-phy";
>> +};
>> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> index 8b9fae3d348a..b46794486037 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> @@ -230,6 +230,64 @@ scmi_shmem: sram@0 {
>>  		};
>>  	};
>>  
>> +	usb_host0_xhci: usb@fcc00000 {
> 
>> +		compatible = "rockchip,rk3399-dwc3";
> 
> Add string to rockchip,dwc3.yaml
> and check with dtsb_check
> 

> compatible = "rockchip,rk3399-dwc3", "snps,dwc3";

compatible = "rockchip,rk3568-dwc3", "snps,dwc3";

> 
>> +		#address-cells = <2>;
> 
> remove
> 
>> +		clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>,
> 
>> +			 <&cru ACLK_USB3OTG0>, <&cru PCLK_PIPE>;
> 
> PCLK_PIPE part of an other node, probably only to enable PD_PIPE.
> 
> 	combphy1: phy@fe830000 {
> 		compatible = "rockchip,rk3568-naneng-combphy";
> 		reg = <0x0 0xfe830000 0x0 0x100>;
> 		clocks = <&pmucru CLK_PCIEPHY1_REF>,
> 			 <&cru PCLK_PIPEPHY1>,
> 			 <&cru PCLK_PIPE>;
> 		clock-names = "ref", "apb", "pipe";
> 		assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;
> 		assigned-clock-rates = <100000000>;
> 		resets = <&cru SRST_PIPEPHY1>;
> 		rockchip,pipe-grf = <&pipegrf>;
> 		rockchip,pipe-phy-grf = <&pipe_phy_grf1>;
> 		#phy-cells = <1>;
> 		status = "disabled";
> 	};
> 
> Rockchip RK3568 TRM Part1 V1.0-20210111.pdf
> page 475
> 
> PD_PIPE:
> 
> BIU_PIPE
> USB3OTG
> PCIE20
> PCIE30
> SATA
> XPCS
> 
> PCIE, SATA USB clocks are child of aclk_pipe
> Yet PCLK_PIPE is the only clock that enables RK3568_PD_PIPE.
> 
> 
> 	COMPOSITE_NOMUX(PCLK_PIPE, "pclk_pipe", "aclk_pipe", 0,
> 			RK3568_CLKSEL_CON(29), 4, 4, DFLAGS,
> 			RK3568_CLKGATE_CON(10), 1, GFLAGS),
> 
> &power {
> 	power-domain@RK3568_PD_PIPE {
> 		reg = <RK3568_PD_PIPE>;
> 
> 		clocks = <&cru PCLK_PIPE>;
> 
> Do we need more clocks here for USB for example?
> 
> 		pm_qos = <&qos_pcie2x1>,
> 			 <&qos_pcie3x1>,
> 			 <&qos_pcie3x2>,
> 			 <&qos_sata0>,
> 			 <&qos_sata1>,
> 			 <&qos_sata2>,
> 			 <&qos_usb3_0>,
> 			 <&qos_usb3_1>;
> 		#power-domain-cells = <0>;
> 	};
> };
> 
>> +		clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk";
> 
> grf_clk only related to rk3399 ACLK_USB3_GRF and not to PCLK_PIPE.
> 
>> +		ranges;
>> +		#size-cells = <2>;
> 
> remove
> 
>> +		status = "disabled";
>> +
>> +		usb_host0_dwc3: usb@fcc00000 {
> 
> No subnode for "snps,dwc3"
> No more subdriver like rk3399.
> Use dwc core only and fix things/quirks there.
> 
>> +			compatible = "snps,dwc3";
>> +			reg = <0x0 0xfcc00000 0x0 0x400000>;
>> +			interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
>> +			dr_mode = "otg";
>> +			phy_type = "utmi_wide";
>> +			power-domains = <&power RK3568_PD_PIPE>;
>> +			resets = <&cru SRST_USB3OTG0>;
>> +			reset-names = "usb3-otg";
>> +			snps,dis-del-phy-power-chg-quirk;
>> +			snps,dis_enblslpm_quirk;
>> +			snps,dis_rxdet_inp3_quirk;
>> +			snps,dis-tx-ipgap-linecheck-quirk;
>> +			snps,dis-u2-freeclk-exists-quirk;
> 
>> +			snps,xhci-trb-ent-quirk;
> 
> Not in mainline.
> See snps,dwc3.yaml
> 
>> +		};
>> +	};
>> +
>> +	usb_host1_xhci: usb@fd000000 {

>> +		compatible = "rockchip,rk3399-dwc3";

compatible = "rockchip,rk3568-dwc3", "snps,dwc3";

>> +		#address-cells = <2>;
>> +		clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>,
>> +			 <&cru ACLK_USB3OTG1>, <&cru PCLK_PIPE>;
>> +		clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk";
>> +		ranges;
>> +		#size-cells = <2>;
>> +		status = "disabled";
>> +
>> +		usb_host1_dwc3: usb@fd000000 {
>> +			compatible = "snps,dwc3";
>> +			reg = <0x0 0xfd000000 0x0 0x400000>;
>> +			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
>> +			dr_mode = "host";
>> +			phy_type = "utmi_wide";
>> +			phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
>> +			phy-names = "usb2-phy", "usb3-phy";
>> +			power-domains = <&power RK3568_PD_PIPE>;
>> +			resets = <&cru SRST_USB3OTG1>;
> 
>> +			reset-names = "usb3-host";
> 
>   reset-names:
>     const: usb3-otg
> 
> Fix binding or DT ??
> 
>> +			snps,dis-del-phy-power-chg-quirk;
>> +			snps,dis_enblslpm_quirk;
>> +			snps,dis_rxdet_inp3_quirk;
>> +			snps,dis-tx-ipgap-linecheck-quirk;
>> +			snps,dis-u2-freeclk-exists-quirk;
> 
>> +			snps,xhci-trb-ent-quirk;
> 
> Not in mainline ??
> 
>> +		};
>> +	};
>> +
> 
> 
> 	usbdrd3_1: usb@fd000000 {

> 		compatible = "rockchip,rk3399-dwc3", "snps,dwc3";

compatible = "rockchip,rk3568-dwc3", "snps,dwc3";

> 		reg = <0x0 0xfd000000 0x0 0x400000>;
> 		interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
> 		clocks = <&cru CLK_USB3OTG1_REF>,
> 			 <&cru CLK_USB3OTG1_SUSPEND>,
> 			 <&cru ACLK_USB3OTG1>;
> 		clock-names = "ref_clk", "suspend_clk", "bus_clk";
> 		dr_mode = "host";
> 		phy_type = "utmi_wide";
> 		phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
> 		phy-names = "usb2-phy", "usb3-phy";
> 		power-domains = <&power RK3568_PD_PIPE>;
> 		resets = <&cru SRST_USB3OTG1>;
> 		reset-names = "usb3-otg";
> 		snps,dis-del-phy-power-chg-quirk;
> 		snps,dis_enblslpm_quirk;
> 		snps,dis_rxdet_inp3_quirk;
> 		snps,dis-tx-ipgap-linecheck-quirk;
> 		snps,dis-u2-freeclk-exists-quirk;
> 		status = "disabled";
> 	};
> 
> 
>>  	gic: interrupt-controller@fd400000 {
>>  		compatible = "arm,gic-v3";
>>  		reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
index 91a0b798b857..0cd4ef36066a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
@@ -116,3 +116,8 @@  power-domain@RK3568_PD_PIPE {
 		#power-domain-cells = <0>;
 	};
 };
+
+&usb_host0_dwc3 {
+	phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;
+	phy-names = "usb2-phy", "usb3-phy";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index 8b9fae3d348a..b46794486037 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -230,6 +230,64 @@  scmi_shmem: sram@0 {
 		};
 	};
 
+	usb_host0_xhci: usb@fcc00000 {
+		compatible = "rockchip,rk3399-dwc3";
+		#address-cells = <2>;
+		clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>,
+			 <&cru ACLK_USB3OTG0>, <&cru PCLK_PIPE>;
+		clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk";
+		ranges;
+		#size-cells = <2>;
+		status = "disabled";
+
+		usb_host0_dwc3: usb@fcc00000 {
+			compatible = "snps,dwc3";
+			reg = <0x0 0xfcc00000 0x0 0x400000>;
+			interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+			dr_mode = "otg";
+			phy_type = "utmi_wide";
+			power-domains = <&power RK3568_PD_PIPE>;
+			resets = <&cru SRST_USB3OTG0>;
+			reset-names = "usb3-otg";
+			snps,dis-del-phy-power-chg-quirk;
+			snps,dis_enblslpm_quirk;
+			snps,dis_rxdet_inp3_quirk;
+			snps,dis-tx-ipgap-linecheck-quirk;
+			snps,dis-u2-freeclk-exists-quirk;
+			snps,xhci-trb-ent-quirk;
+		};
+	};
+
+	usb_host1_xhci: usb@fd000000 {
+		compatible = "rockchip,rk3399-dwc3";
+		#address-cells = <2>;
+		clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>,
+			 <&cru ACLK_USB3OTG1>, <&cru PCLK_PIPE>;
+		clock-names = "ref_clk", "suspend_clk", "bus_clk", "grf_clk";
+		ranges;
+		#size-cells = <2>;
+		status = "disabled";
+
+		usb_host1_dwc3: usb@fd000000 {
+			compatible = "snps,dwc3";
+			reg = <0x0 0xfd000000 0x0 0x400000>;
+			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
+			dr_mode = "host";
+			phy_type = "utmi_wide";
+			phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
+			phy-names = "usb2-phy", "usb3-phy";
+			power-domains = <&power RK3568_PD_PIPE>;
+			resets = <&cru SRST_USB3OTG1>;
+			reset-names = "usb3-host";
+			snps,dis-del-phy-power-chg-quirk;
+			snps,dis_enblslpm_quirk;
+			snps,dis_rxdet_inp3_quirk;
+			snps,dis-tx-ipgap-linecheck-quirk;
+			snps,dis-u2-freeclk-exists-quirk;
+			snps,xhci-trb-ent-quirk;
+		};
+	};
+
 	gic: interrupt-controller@fd400000 {
 		compatible = "arm,gic-v3";
 		reg = <0x0 0xfd400000 0 0x10000>, /* GICD */