[PATCH v2 0/2] Flatten usb controller nodes on Talos

[PATCH v2 0/2] Flatten usb controller nodes on Talos

[Krishna Kurapati]

Flatten usb controller node and update to using latest bindings and
flattened driver approach. While at it, add the wakeup-source property
to usb controller nodes.

Changes in v2:
Reversed order of patches as per comment from Dmitry

Link to v1:
https://lore.kernel.org/all/20260127155537.4088709-1-krishna.kurapati@oss.qualcomm.com/

Krishna Kurapati (2):
  arm64: dts: qcom: talos: Flatten usb controller nodes
  arm64: dts: qcom: talos: Mark usb controllers are wakeup capable
    devices

 arch/arm64/boot/dts/qcom/qcs615-ride.dts | 12 +--
 arch/arm64/boot/dts/qcom/talos.dtsi      | 97 ++++++++++--------------
 2 files changed, 46 insertions(+), 63 deletions(-)

-- 
2.34.1

[PATCH v2 1/2] arm64: dts: qcom: talos: Flatten usb controller nodes

[Krishna Kurapati]

Flatten usb controller nodes and update to using latest bindings
and flattened driver approach.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/qcs615-ride.dts | 12 +--
 arch/arm64/boot/dts/qcom/talos.dtsi      | 94 ++++++++++--------------
 2 files changed, 43 insertions(+), 63 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/qcs615-ride.dts b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
index 5a24c19c415e..4f5dca49e15a 100644
--- a/arch/arm64/boot/dts/qcom/qcs615-ride.dts
+++ b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
@@ -655,11 +655,9 @@ &usb_qmpphy_2 {
 };
 
 &usb_1 {
-	status = "okay";
-};
-
-&usb_1_dwc3 {
 	dr_mode = "peripheral";
+
+	status = "okay";
 };
 
 &usb_hsphy_2 {
@@ -671,11 +669,9 @@ &usb_hsphy_2 {
 };
 
 &usb_2 {
-	status = "okay";
-};
-
-&usb_2_dwc3 {
 	dr_mode = "host";
+
+	status = "okay";
 };
 
 &ufs_mem_hc {
diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
index 75716b4a58d6..8b2e8d335d80 100644
--- a/arch/arm64/boot/dts/qcom/talos.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos.dtsi
@@ -4486,9 +4486,9 @@ usb_qmpphy_2: phy@88e8000 {
 			status = "disabled";
 		};
 
-		usb_1: usb@a6f8800 {
-			compatible = "qcom,qcs615-dwc3", "qcom,dwc3";
-			reg = <0x0 0x0a6f8800 0x0 0x400>;
+		usb_1: usb@a600000 {
+			compatible = "qcom,qcs615-dwc3", "qcom,snps-dwc3";
+			reg = <0x0 0x0a600000 0x0 0xfc100>;
 
 			clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
 				 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ -4507,52 +4507,44 @@ usb_1: usb@a6f8800 {
 					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <200000000>;
 
-			interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
+			interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&pdc 9 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 8 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 6 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "pwr_event",
+			interrupt-names = "dwc_usb3",
+					  "pwr_event",
 					  "hs_phy_irq",
 					  "dp_hs_phy_irq",
 					  "dm_hs_phy_irq",
 					  "ss_phy_irq";
 
+			iommus = <&apps_smmu 0x140 0x0>;
+
+			phys = <&usb_1_hsphy>, <&usb_qmpphy>;
+			phy-names = "usb2-phy", "usb3-phy";
+
 			power-domains = <&gcc USB30_PRIM_GDSC>;
 			required-opps = <&rpmhpd_opp_nom>;
 
 			resets = <&gcc GCC_USB30_PRIM_BCR>;
 
-			#address-cells = <2>;
-			#size-cells = <2>;
-			ranges;
+			snps,dis-u1-entry-quirk;
+			snps,dis-u2-entry-quirk;
+			snps,dis_u2_susphy_quirk;
+			snps,dis_u3_susphy_quirk;
+			snps,dis_enblslpm_quirk;
+			snps,has-lpm-erratum;
+			snps,hird-threshold = /bits/ 8 <0x10>;
+			snps,usb3_lpm_capable;
 
 			status = "disabled";
-
-			usb_1_dwc3: usb@a600000 {
-				compatible = "snps,dwc3";
-				reg = <0x0 0x0a600000 0x0 0xcd00>;
-
-				iommus = <&apps_smmu 0x140 0x0>;
-				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>;
-
-				phys = <&usb_1_hsphy>, <&usb_qmpphy>;
-				phy-names = "usb2-phy", "usb3-phy";
-
-				snps,dis-u1-entry-quirk;
-				snps,dis-u2-entry-quirk;
-				snps,dis_u2_susphy_quirk;
-				snps,dis_u3_susphy_quirk;
-				snps,dis_enblslpm_quirk;
-				snps,has-lpm-erratum;
-				snps,hird-threshold = /bits/ 8 <0x10>;
-				snps,usb3_lpm_capable;
-			};
 		};
 
-		usb_2: usb@a8f8800 {
-			compatible = "qcom,qcs615-dwc3", "qcom,dwc3";
-			reg = <0x0 0x0a8f8800 0x0 0x400>;
+		usb_2: usb@a800000 {
+			compatible = "qcom,qcs615-dwc3", "qcom,snps-dwc3";
+			reg = <0x0 0x0a800000 0x0 0xfc100>;
 
 			clocks = <&gcc GCC_CFG_NOC_USB2_SEC_AXI_CLK>,
 				 <&gcc GCC_USB20_SEC_MASTER_CLK>,
@@ -4571,15 +4563,22 @@ usb_2: usb@a8f8800 {
 					  <&gcc GCC_USB20_SEC_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <200000000>;
 
-			interrupts-extended = <&intc GIC_SPI 663 IRQ_TYPE_LEVEL_HIGH 0>,
+			interrupts-extended = <&intc GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 663 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&intc GIC_SPI 662 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&pdc 11 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 10 IRQ_TYPE_EDGE_BOTH>;
-			interrupt-names = "pwr_event",
+			interrupt-names = "dwc_usb3",
+					  "pwr_event",
 					  "hs_phy_irq",
 					  "dp_hs_phy_irq",
 					  "dm_hs_phy_irq";
 
+			iommus = <&apps_smmu 0xe0 0x0>;
+
+			phys = <&usb_hsphy_2>;
+			phy-names = "usb2-phy";
+
 			power-domains = <&gcc USB20_SEC_GDSC>;
 			required-opps = <&rpmhpd_opp_nom>;
 
@@ -4587,30 +4586,15 @@ usb_2: usb@a8f8800 {
 
 			qcom,select-utmi-as-pipe-clk;
 
-			#address-cells = <2>;
-			#size-cells = <2>;
-			ranges;
-
-			status = "disabled";
+			snps,dis_u2_susphy_quirk;
+			snps,dis_u3_susphy_quirk;
+			snps,dis_enblslpm_quirk;
+			snps,has-lpm-erratum;
+			snps,hird-threshold = /bits/ 8 <0x10>;
 
-			usb_2_dwc3: usb@a800000 {
-				compatible = "snps,dwc3";
-				reg = <0x0 0x0a800000 0x0 0xcd00>;
+			maximum-speed = "high-speed";
 
-				iommus = <&apps_smmu 0xe0 0x0>;
-				interrupts = <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>;
-
-				phys = <&usb_hsphy_2>;
-				phy-names = "usb2-phy";
-
-				snps,dis_u2_susphy_quirk;
-				snps,dis_u3_susphy_quirk;
-				snps,dis_enblslpm_quirk;
-				snps,has-lpm-erratum;
-				snps,hird-threshold = /bits/ 8 <0x10>;
-
-				maximum-speed = "high-speed";
-			};
+			status = "disabled";
 		};
 
 		tsens0: thermal-sensor@c263000 {
-- 
2.34.1

Re: [PATCH v2 1/2] arm64: dts: qcom: talos: Flatten usb controller nodes

[Konrad Dybcio]

On 1/28/26 7:27 AM, Krishna Kurapati wrote:
> Flatten usb controller nodes and update to using latest bindings
> and flattened driver approach.
> 
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---

Have you checked whether this brings about the same crash-on-suspend
issue as it does on Hamoa?

https://lore.kernel.org/linux-arm-msm/71c15a78-7a50-4913-b677-e5308fcabfad@packett.cool/

Konrad

Re: [PATCH v2 1/2] arm64: dts: qcom: talos: Flatten usb controller nodes

[Krishna Kurapati]

On 1/28/2026 4:01 PM, Konrad Dybcio wrote:
> On 1/28/26 7:27 AM, Krishna Kurapati wrote:
>> Flatten usb controller nodes and update to using latest bindings
>> and flattened driver approach.
>>
>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>> ---
> 
> Have you checked whether this brings about the same crash-on-suspend
> issue as it does on Hamoa?
> 
> https://lore.kernel.org/linux-arm-msm/71c15a78-7a50-4913-b677-e5308fcabfad@packett.cool/
> 

Hi Konrad,

  Yes, I did check system suspend use case after flattening and there is 
no crash seen.

  The only issue I observed (both before and after flattening) is that 
waking up from bus suspend, there is an enumeration failure on second 
port in host mode, and an xHCI CMD_RUN timeout occurs. The issue is gone 
if we keep controller GDSC flags as RET_ON (not the right solution 
though). But this issue has nothing to do with flattening. I will sync 
up with clocks team and try to fix that host mode issue.

Regards,
Krishna,

Re: [PATCH v2 1/2] arm64: dts: qcom: talos: Flatten usb controller nodes

[Konrad Dybcio]

On 1/28/26 5:09 PM, Krishna Kurapati wrote:
> 
> 
> On 1/28/2026 4:01 PM, Konrad Dybcio wrote:
>> On 1/28/26 7:27 AM, Krishna Kurapati wrote:
>>> Flatten usb controller nodes and update to using latest bindings
>>> and flattened driver approach.
>>>
>>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
>>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>>> ---
>>
>> Have you checked whether this brings about the same crash-on-suspend
>> issue as it does on Hamoa?
>>
>> https://lore.kernel.org/linux-arm-msm/71c15a78-7a50-4913-b677-e5308fcabfad@packett.cool/
>>
> 
> Hi Konrad,
> 
>  Yes, I did check system suspend use case after flattening and there is no crash seen.
> 
>  The only issue I observed (both before and after flattening) is that waking up from bus suspend, there is an enumeration failure on second port in host mode, and an xHCI CMD_RUN timeout occurs. The issue is gone if we keep controller GDSC flags as RET_ON (not the right solution though). But this issue has nothing to do with flattening. I will sync up with clocks team and try to fix that host mode issue.

diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
index 75716b4a58d6..7e7f4eae8a98 100644
--- a/arch/arm64/boot/dts/qcom/talos.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos.dtsi
@@ -4559,7 +4559,7 @@ usb_2: usb@a8f8800 {
                                 <&gcc GCC_AGGRE_USB2_SEC_AXI_CLK>,
                                 <&gcc GCC_USB20_SEC_SLEEP_CLK>,
                                 <&gcc GCC_USB20_SEC_MOCK_UTMI_CLK>,
-                                <&gcc GCC_USB2_PRIM_CLKREF_CLK>;
+                                <&gcc GCC_USB3_SEC_CLKREF_CLK>;


?

Konrad

Re: [PATCH v2 1/2] arm64: dts: qcom: talos: Flatten usb controller nodes

[Krishna Kurapati]

On 1/29/2026 4:58 PM, Konrad Dybcio wrote:
> On 1/28/26 5:09 PM, Krishna Kurapati wrote:
>>
>>
>> On 1/28/2026 4:01 PM, Konrad Dybcio wrote:
>>> On 1/28/26 7:27 AM, Krishna Kurapati wrote:
>>>> Flatten usb controller nodes and update to using latest bindings
>>>> and flattened driver approach.
>>>>
>>>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
>>>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>>>> ---
>>>
>>> Have you checked whether this brings about the same crash-on-suspend
>>> issue as it does on Hamoa?
>>>
>>> https://lore.kernel.org/linux-arm-msm/71c15a78-7a50-4913-b677-e5308fcabfad@packett.cool/
>>>
>>
>> Hi Konrad,
>>
>>   Yes, I did check system suspend use case after flattening and there is no crash seen.
>>
>>   The only issue I observed (both before and after flattening) is that waking up from bus suspend, there is an enumeration failure on second port in host mode, and an xHCI CMD_RUN timeout occurs. The issue is gone if we keep controller GDSC flags as RET_ON (not the right solution though). But this issue has nothing to do with flattening. I will sync up with clocks team and try to fix that host mode issue.
> 
> diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
> index 75716b4a58d6..7e7f4eae8a98 100644
> --- a/arch/arm64/boot/dts/qcom/talos.dtsi
> +++ b/arch/arm64/boot/dts/qcom/talos.dtsi
> @@ -4559,7 +4559,7 @@ usb_2: usb@a8f8800 {
>                                   <&gcc GCC_AGGRE_USB2_SEC_AXI_CLK>,
>                                   <&gcc GCC_USB20_SEC_SLEEP_CLK>,
>                                   <&gcc GCC_USB20_SEC_MOCK_UTMI_CLK>,
> -                                <&gcc GCC_USB2_PRIM_CLKREF_CLK>;
> +                                <&gcc GCC_USB3_SEC_CLKREF_CLK>;
> 
> 

I tried this out but it didn't work.

Regards,
Krishna,

Re: [PATCH v2 1/2] arm64: dts: qcom: talos: Flatten usb controller nodes

[Konrad Dybcio]

On 1/28/26 7:27 AM, Krishna Kurapati wrote:
> Flatten usb controller nodes and update to using latest bindings
> and flattened driver approach.
> 
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

[PATCH v2 2/2] arm64: dts: qcom: talos: Mark usb controllers are wakeup capable devices

[Krishna Kurapati]

USB controllers on talos are wakeup capable. Hence add wakeup-source
property to both controller nodes.

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/talos.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
index 8b2e8d335d80..5e004967ae83 100644
--- a/arch/arm64/boot/dts/qcom/talos.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos.dtsi
@@ -4539,6 +4539,8 @@ usb_1: usb@a600000 {
 			snps,hird-threshold = /bits/ 8 <0x10>;
 			snps,usb3_lpm_capable;
 
+			wakeup-source;
+
 			status = "disabled";
 		};
 
@@ -4593,6 +4595,7 @@ usb_2: usb@a800000 {
 			snps,hird-threshold = /bits/ 8 <0x10>;
 
 			maximum-speed = "high-speed";
+			wakeup-source;
 
 			status = "disabled";
 		};
-- 
2.34.1

Re: [PATCH v2 2/2] arm64: dts: qcom: talos: Mark usb controllers are wakeup capable devices

[Konrad Dybcio]

On 1/28/26 7:27 AM, Krishna Kurapati wrote:
> USB controllers on talos are wakeup capable. Hence add wakeup-source
> property to both controller nodes.
> 
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH v2 2/2] arm64: dts: qcom: talos: Mark usb controllers are wakeup capable devices

[Dmitry Baryshkov]

On Wed, Jan 28, 2026 at 11:57:20AM +0530, Krishna Kurapati wrote:
> USB controllers on talos are wakeup capable. Hence add wakeup-source
> property to both controller nodes.
> 
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/talos.dtsi | 3 +++
>  1 file changed, 3 insertions(+)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Re: [PATCH v2 0/2] Flatten usb controller nodes on Talos

[Rob Herring]

On Wed, 28 Jan 2026 11:57:18 +0530, Krishna Kurapati wrote:
> Flatten usb controller node and update to using latest bindings and
> flattened driver approach. While at it, add the wakeup-source property
> to usb controller nodes.
> 
> Changes in v2:
> Reversed order of patches as per comment from Dmitry
> 
> Link to v1:
> https://lore.kernel.org/all/20260127155537.4088709-1-krishna.kurapati@oss.qualcomm.com/
> 
> Krishna Kurapati (2):
>   arm64: dts: qcom: talos: Flatten usb controller nodes
>   arm64: dts: qcom: talos: Mark usb controllers are wakeup capable
>     devices
> 
>  arch/arm64/boot/dts/qcom/qcs615-ride.dts | 12 +--
>  arch/arm64/boot/dts/qcom/talos.dtsi      | 97 ++++++++++--------------
>  2 files changed, 46 insertions(+), 63 deletions(-)
> 
> --
> 2.34.1
> 
> 
> 


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

Some warnings may be existing warnings. Consider fixing existing
warnings before adding new features.

Perhaps the warnings are fixed by another series. If that is the case,
please set the base commit and any dependencies for the series using
"b4".

Ultimately, it is up to the platform maintainer whether these warnings
are acceptable or not.

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


This patch series was applied (using b4) to base:
 Base: attempting to guess base-commit...
 Base: tags/next-20260127 (exact match)
 Base: tags/next-20260127 (use --merge-base to override)

If this is not the correct base, please add 'base-commit' tag
(or use b4 which does this automatically)


New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/qcom/' for 20260128062720.437712-1-krishna.kurapati@oss.qualcomm.com:

arch/arm64/boot/dts/qcom/qcs615-ride.dtb: clock-controller@100000 (qcom,qcs615-gcc): 'clock-names' is a required property
	from schema $id: http://devicetree.org/schemas/clock/qcom,qcs615-gcc.yaml

Re: [PATCH v2 0/2] Flatten usb controller nodes on Talos

[Bjorn Andersson]

On Wed, 28 Jan 2026 11:57:18 +0530, Krishna Kurapati wrote:
> Flatten usb controller node and update to using latest bindings and
> flattened driver approach. While at it, add the wakeup-source property
> to usb controller nodes.
> 
> Changes in v2:
> Reversed order of patches as per comment from Dmitry
> 
> [...]

Applied, thanks!

[1/2] arm64: dts: qcom: talos: Flatten usb controller nodes
      commit: c1e77b13457d20f14c70e623f7c0a6a3cefc1d67
[2/2] arm64: dts: qcom: talos: Mark usb controllers are wakeup capable devices
      commit: d304777ee4988b4faac62a7fb731f79f64c17a8d

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>