[PATCH 0/3] arm64: dts: qcom: rb3gen2: add second USB port

[PATCH 0/3] arm64: dts: qcom: rb3gen2: add second USB port

[Caleb Connolly]

Make the necessary adjustments to enable the secondary USB controller,
which is routed directly to a micro-USB port. This is intended for
debugging via EUD, and is otherwise useful as a host-facing port with
mass storage or network gadgets, allowing the type-c to be used with a
hub.

Peripheral mode has been tested with a network gadget, but I don't have
the necessary hardware on hand to test host mode.

---
Caleb Connolly (3):
      arm64: dts: qcom: sc7280: convert usb_2 to support multiple ports
      arm64: dts: qcom: qcs6490-rb3gen2: make node names consistent
      arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port

 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 75 ++++++++++++++++++++++++++--
 arch/arm64/boot/dts/qcom/sc7280.dtsi         | 18 +++++--
 2 files changed, 87 insertions(+), 6 deletions(-)
---
base-commit: ecc768a84f0b8e631986f9ade3118fa37852fef0

// Caleb (they/them)

[PATCH 1/3] arm64: dts: qcom: sc7280: convert usb_2 to support multiple ports

[Caleb Connolly]

We might have more than one port, so use ports instead for the second
USB controllers.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc7280.dtsi | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 3d8410683402..06a74601c2d7 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -3712,11 +3712,23 @@ usb_2_dwc3: usb@8c00000 {
 				phy-names = "usb2-phy";
 				maximum-speed = "high-speed";
 				usb-role-switch;
 
-				port {
-					usb2_role_switch: endpoint {
-						remote-endpoint = <&eud_ep>;
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					port@0 {
+						reg = <0>;
+						usb_2_dwc3_hs: endpoint {
+						};
+					};
+
+
+					port@1 {
+						usb2_role_switch: endpoint {
+							remote-endpoint = <&eud_ep>;
+						};
 					};
 				};
 			};
 		};

-- 
2.46.0

[PATCH 2/3] arm64: dts: qcom: qcs6490-rb3gen2: make node names consistent

[Caleb Connolly]

We like to order node names alphabetically, to aid in this we should
prefer naming nodes with the node type (connector, regulator, etc) at
the start, so we can group similar types together.

Adjust this on rb3gen2 so we can group connectors and regulators
together.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 0d45662b8028..513d5265bb13 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -37,9 +37,9 @@ aliases {
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	dp-connector {
+	connector-dp {
 		compatible = "dp-connector";
 		label = "DP";
 		type = "mini";
 
@@ -51,9 +51,9 @@ dp_connector_in: endpoint {
 			};
 		};
 	};
 
-	hdmi-connector {
+	connector-hdmi {
 		compatible = "hdmi-connector";
 		type = "a";
 
 		port {
@@ -195,9 +195,9 @@ pmic_glink_sbu_in: endpoint {
 			};
 		};
 	};
 
-	vph_pwr: vph-pwr-regulator {
+	vph_pwr: regulator-vph-pwr {
 		compatible = "regulator-fixed";
 		regulator-name = "vph_pwr";
 		regulator-min-microvolt = <3700000>;
 		regulator-max-microvolt = <3700000>;

-- 
2.46.0

[PATCH 3/3] arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port

[Caleb Connolly]

The secondary USB controller on the rb3gen2 is routed directly to a
mico-USB port where it can be used for EUD debugging or in OTG mode.

Configure the controller to prefer peripheral mode (as this is almost
always more useful) and describe the connector, vbus supply, and ID pin.

OTG/Host mode is untested as I don't have micro-USB OTG cables to hand.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 69 ++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 513d5265bb13..fe66f589cb5b 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -62,8 +62,30 @@ hdmi_con: endpoint {
 			};
 		};
 	};
 
+	connector-usb2 {
+		compatible = "gpio-usb-b-connector";
+		vbus-gpio = <&pm7325_gpios 9 GPIO_ACTIVE_HIGH>;
+		id-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>;
+		vbus-supply = <&vbus_usb2>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb2_vbus_detect_pin>,
+			     <&usb2_id_detect_pin>;
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				usb2_port_connector: endpoint {
+					remote-endpoint = <&usb_2_dwc3_hs>;
+				};
+			};
+		};
+	};
+
 	lt9611_1v2: lt9611-vdd12-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "LT9611_1V2";
 
@@ -195,8 +217,18 @@ pmic_glink_sbu_in: endpoint {
 			};
 		};
 	};
 
+	vbus_usb2: regulator-usb2-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "vbus_supply";
+		gpio = <&tlmm 63 GPIO_ACTIVE_HIGH>;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-boot-on;
+		enable-active-high;
+	};
+
 	vph_pwr: regulator-vph-pwr {
 		compatible = "regulator-fixed";
 		regulator-name = "vph_pwr";
 		regulator-min-microvolt = <3700000>;
@@ -683,8 +715,18 @@ &mdss_edp_out {
 &mdss_edp_phy {
 	status = "okay";
 };
 
+&pm7325_gpios {
+	usb2_vbus_detect_pin: usb2-vbus-detect-state {
+		pins = "gpio9";
+		function = "normal";
+		bias-pull-down;
+		input-enable;
+		power-source = <0>;
+	};
+};
+
 &pmk8350_rtc {
 	status = "okay";
 };
 
@@ -718,8 +760,15 @@ &remoteproc_wpss {
 
 &tlmm {
 	gpio-reserved-ranges = <32 2>, /* ADSP */
 			       <48 4>; /* NFC */
+
+	usb2_id_detect_pin: usb2-id-detect-state {
+		pins = "gpio61";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-up;
+	};
 };
 
 &uart5 {
 	status = "okay";
@@ -758,8 +807,28 @@ &usb_1_qmpphy {
 
 	status = "okay";
 };
 
+&usb_2 {
+	status = "okay";
+};
+
+&usb_2_dwc3 {
+	role-switch-default-mode = "peripheral";
+};
+
+&usb_2_dwc3_hs {
+	remote-endpoint = <&usb2_port_connector>;
+};
+
+&usb_2_hsphy {
+	vdda-pll-supply = <&vreg_l10c_0p88>;
+	vdda18-supply = <&vreg_l1c_1p8>;
+	vdda33-supply = <&vreg_l2b_3p072>;
+
+	status = "okay";
+};
+
 &usb_dp_qmpphy_out {
 	remote-endpoint = <&redriver_phy_con_ss>;
 };
 

-- 
2.46.0

Re: [PATCH 0/3] arm64: dts: qcom: rb3gen2: add second USB port

[Rob Herring (Arm)]

On Wed, 04 Sep 2024 13:16:23 +0200, Caleb Connolly wrote:
> Make the necessary adjustments to enable the secondary USB controller,
> which is routed directly to a micro-USB port. This is intended for
> debugging via EUD, and is otherwise useful as a host-facing port with
> mass storage or network gadgets, allowing the type-c to be used with a
> hub.
> 
> Peripheral mode has been tested with a network gadget, but I don't have
> the necessary hardware on hand to test host mode.
> 
> ---
> Caleb Connolly (3):
>       arm64: dts: qcom: sc7280: convert usb_2 to support multiple ports
>       arm64: dts: qcom: qcs6490-rb3gen2: make node names consistent
>       arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port
> 
>  arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 75 ++++++++++++++++++++++++++--
>  arch/arm64/boot/dts/qcom/sc7280.dtsi         | 18 +++++--
>  2 files changed, 87 insertions(+), 6 deletions(-)
> ---
> base-commit: ecc768a84f0b8e631986f9ade3118fa37852fef0
> 
> // Caleb (they/them)
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


New warnings running 'make CHECK_DTBS=y qcom/qcs6490-rb3gen2.dtb' for 20240904-b4-rb3gen2-usb2-v1-0-b858e681195e@linaro.org:

arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: usb@8cf8800: usb@8c00000:ports:port@1: 'reg' is a required property
	from schema $id: http://devicetree.org/schemas/usb/qcom,dwc3.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: usb@8cf8800: usb@8c00000: Unevaluated properties are not allowed ('ports' was unexpected)
	from schema $id: http://devicetree.org/schemas/usb/qcom,dwc3.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: usb@8cf8800: usb@8c00000: Unevaluated properties are not allowed ('ports' was unexpected)
	from schema $id: http://devicetree.org/schemas/usb/qcom,dwc3.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: usb@8c00000: ports:port@1: 'reg' is a required property
	from schema $id: http://devicetree.org/schemas/usb/snps,dwc3.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: usb@8c00000: Unevaluated properties are not allowed ('ports' was unexpected)
	from schema $id: http://devicetree.org/schemas/usb/snps,dwc3.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: connector-usb2: compatible: 'oneOf' conditional failed, one must be fixed:
	['gpio-usb-b-connector'] is too short
	'gpio-usb-b-connector' is not one of ['usb-a-connector', 'usb-b-connector', 'usb-c-connector']
	'samsung,usb-connector-11pin' was expected
	from schema $id: http://devicetree.org/schemas/connector/usb-connector.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: connector-usb2: 'anyOf' conditional failed, one must be fixed:
	'vbus-gpios' is a required property
	'id-gpios' is a required property
	from schema $id: http://devicetree.org/schemas/connector/usb-connector.yaml#
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dtb: connector-usb2: Unevaluated properties are not allowed ('compatible', 'id-gpio', 'vbus-gpio' were unexpected)
	from schema $id: http://devicetree.org/schemas/connector/usb-connector.yaml#

Re: [PATCH 3/3] arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port

[Konrad Dybcio]

On 4.09.2024 1:16 PM, Caleb Connolly wrote:
> The secondary USB controller on the rb3gen2 is routed directly to a
> mico-USB port where it can be used for EUD debugging or in OTG mode.
> 
> Configure the controller to prefer peripheral mode (as this is almost
> always more useful) and describe the connector, vbus supply, and ID pin.
> 
> OTG/Host mode is untested as I don't have micro-USB OTG cables to hand.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 69 ++++++++++++++++++++++++++++
>  1 file changed, 69 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> index 513d5265bb13..fe66f589cb5b 100644
> --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> @@ -62,8 +62,30 @@ hdmi_con: endpoint {
>  			};
>  		};
>  	};
>  
> +	connector-usb2 {
> +		compatible = "gpio-usb-b-connector";
> +		vbus-gpio = <&pm7325_gpios 9 GPIO_ACTIVE_HIGH>;
> +		id-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>;

I don't think this is right, what's the revision of the board you have?

Konrad

Re: [PATCH 3/3] arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port

[Krzysztof Kozlowski]

On 05/09/2024 14:05, Konrad Dybcio wrote:
> On 4.09.2024 1:16 PM, Caleb Connolly wrote:
>> The secondary USB controller on the rb3gen2 is routed directly to a
>> mico-USB port where it can be used for EUD debugging or in OTG mode.
>>
>> Configure the controller to prefer peripheral mode (as this is almost
>> always more useful) and describe the connector, vbus supply, and ID pin.
>>
>> OTG/Host mode is untested as I don't have micro-USB OTG cables to hand.
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>>  arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 69 ++++++++++++++++++++++++++++
>>  1 file changed, 69 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
>> index 513d5265bb13..fe66f589cb5b 100644
>> --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
>> +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
>> @@ -62,8 +62,30 @@ hdmi_con: endpoint {
>>  			};
>>  		};
>>  	};
>>  
>> +	connector-usb2 {
>> +		compatible = "gpio-usb-b-connector";
>> +		vbus-gpio = <&pm7325_gpios 9 GPIO_ACTIVE_HIGH>;
>> +		id-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>;
> 
> I don't think this is right, what's the revision of the board you have?

For sure any 'gpio' property is NAK and there is no way this passed
checks...

Best regards,
Krzysztof

Re: [PATCH 3/3] arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port

[Caleb Connolly]

On 05/09/2024 14:11, Krzysztof Kozlowski wrote:
> On 05/09/2024 14:05, Konrad Dybcio wrote:
>> On 4.09.2024 1:16 PM, Caleb Connolly wrote:
>>> The secondary USB controller on the rb3gen2 is routed directly to a
>>> mico-USB port where it can be used for EUD debugging or in OTG mode.
>>>
>>> Configure the controller to prefer peripheral mode (as this is almost
>>> always more useful) and describe the connector, vbus supply, and ID pin.
>>>
>>> OTG/Host mode is untested as I don't have micro-USB OTG cables to hand.
>>>
>>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>>> ---
>>>  arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 69 ++++++++++++++++++++++++++++
>>>  1 file changed, 69 insertions(+)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
>>> index 513d5265bb13..fe66f589cb5b 100644
>>> --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
>>> +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
>>> @@ -62,8 +62,30 @@ hdmi_con: endpoint {
>>>  			};
>>>  		};
>>>  	};
>>>  
>>> +	connector-usb2 {
>>> +		compatible = "gpio-usb-b-connector";
>>> +		vbus-gpio = <&pm7325_gpios 9 GPIO_ACTIVE_HIGH>;
>>> +		id-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>;
>>
>> I don't think this is right, what's the revision of the board you have?

Still don't have schematics, this is based on downstream Qualcomm Linux.
> 
> For sure any 'gpio' property is NAK and there is no way this passed
> checks...

ahh, gpios not gpio right?

sorry, should have caught this.
> 
> Best regards,
> Krzysztof
> 

-- 
// Caleb (they/them)

Re: [PATCH 3/3] arm64: dts: qcom: qcs6490-rb3gen2: describe secondary USB port

[Krzysztof Kozlowski]

On 09/09/2024 13:00, Caleb Connolly wrote:
>>>>  
>>>> +	connector-usb2 {
>>>> +		compatible = "gpio-usb-b-connector";
>>>> +		vbus-gpio = <&pm7325_gpios 9 GPIO_ACTIVE_HIGH>;
>>>> +		id-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>;
>>>
>>> I don't think this is right, what's the revision of the board you have?
> 
> Still don't have schematics, this is based on downstream Qualcomm Linux.
>>
>> For sure any 'gpio' property is NAK and there is no way this passed
>> checks...
> 
> ahh, gpios not gpio right?

Yes.

> 
> sorry, should have caught this.

dtbs_check :)

Best regards,
Krzysztof