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.1On 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
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
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,
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
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,
© 2016 - 2026 Red Hat, Inc.