The USB PHY nodes has inconsistent labels as 'usb_1_hspy'
and 'usb_hsphy_2' across talos.dtsi and qcs615-ride.dts.
This patch renames them to follow a consistent naming
scheme.
No functional changes, only label renaming.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Sudarshan Shetty <tessolveupstream@gmail.com>
---
arch/arm64/boot/dts/qcom/qcs615-ride.dts | 2 +-
arch/arm64/boot/dts/qcom/talos.dtsi | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qcs615-ride.dts b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
index be67eb173046..0ca6b50a6de1 100644
--- a/arch/arm64/boot/dts/qcom/qcs615-ride.dts
+++ b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
@@ -609,7 +609,7 @@ bluetooth {
};
};
-&usb_1_hsphy {
+&usb_hsphy_1 {
vdd-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l12a>;
vdda-phy-dpdm-supply = <&vreg_l13a>;
diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
index 95d26e313622..c7dc507a50b5 100644
--- a/arch/arm64/boot/dts/qcom/talos.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos.dtsi
@@ -4304,7 +4304,7 @@ osm_l3: interconnect@18321000 {
#interconnect-cells = <1>;
};
- usb_1_hsphy: phy@88e2000 {
+ usb_hsphy_1: phy@88e2000 {
compatible = "qcom,qcs615-qusb2-phy";
reg = <0x0 0x88e2000 0x0 0x180>;
@@ -4412,7 +4412,7 @@ usb_1_dwc3: usb@a600000 {
iommus = <&apps_smmu 0x140 0x0>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
- phys = <&usb_1_hsphy>, <&usb_qmpphy>;
+ phys = <&usb_hsphy_1>, <&usb_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";
snps,dis-u1-entry-quirk;
--
2.34.1On 1/14/26 11:00 AM, Sudarshan Shetty wrote: > The USB PHY nodes has inconsistent labels as 'usb_1_hspy' > and 'usb_hsphy_2' across talos.dtsi and qcs615-ride.dts. > This patch renames them to follow a consistent naming > scheme. Sorry for only noticing this now, but usb_hsphy_x is wrong.. *every* other dtsi uses usb_x_hsphy, please flip it around $ rg 'usb_1_hsphy' arch -l | wc -l 93 $ rg 'usb_hsphy_1' arch -l | wc -l 0 Konrad
On 14-01-2026 15:49, Konrad Dybcio wrote:
> On 1/14/26 11:00 AM, Sudarshan Shetty wrote:
>> The USB PHY nodes has inconsistent labels as 'usb_1_hspy'
>> and 'usb_hsphy_2' across talos.dtsi and qcs615-ride.dts.
>> This patch renames them to follow a consistent naming
>> scheme.
>
> Sorry for only noticing this now, but usb_hsphy_x is wrong..
>
> *every* other dtsi uses usb_x_hsphy, please flip it around
>
> $ rg 'usb_1_hsphy' arch -l | wc -l
> 93
>
> $ rg 'usb_hsphy_1' arch -l | wc -l
> 0
>
I've updated the patch to use usb_x_hsphy naming
convention to match the rest of the devicetree files
as below:
diff --git a/arch/arm64/boot/dts/qcom/qcs615-ride.dts b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
index 0ca6b50a6de1..a5f763cf1a55 100644
--- a/arch/arm64/boot/dts/qcom/qcs615-ride.dts
+++ b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
@@ -609,7 +609,7 @@ bluetooth {
};
};
-&usb_hsphy_1 {
+&usb_1_hsphy {
vdd-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l12a>;
vdda-phy-dpdm-supply = <&vreg_l13a>;
@@ -632,7 +632,7 @@ &usb_1_dwc3 {
dr_mode = "peripheral";
};
-&usb_hsphy_2 {
+&usb_2_hsphy {
vdd-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l12a>;
vdda-phy-dpdm-supply = <&vreg_l13a>;
diff --git a/arch/arm64/boot/dts/qcom/talos-evk-som.dtsi b/arch/arm64/boot/dts/qcom/talos-evk-som.dtsi
index 95ed335bcb08..a236f8a65937 100644
--- a/arch/arm64/boot/dts/qcom/talos-evk-som.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos-evk-som.dtsi
@@ -556,7 +556,7 @@ &usb_1_dwc3 {
dr_mode = "host";
};
-&usb_hsphy_1 {
+&usb_1_hsphy {
vdd-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l12a>;
vdda-phy-dpdm-supply = <&vreg_l13a>;
@@ -572,7 +572,7 @@ &usb_2_dwc3 {
dr_mode = "host";
};
-&usb_hsphy_2 {
+&usb_2_hsphy {
vdd-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l12a>;
vdda-phy-dpdm-supply = <&vreg_l13a>;
diff --git a/arch/arm64/boot/dts/qcom/talos.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
index c7dc507a50b5..cb32bfe732fb 100644
--- a/arch/arm64/boot/dts/qcom/talos.dtsi
+++ b/arch/arm64/boot/dts/qcom/talos.dtsi
@@ -4304,7 +4304,7 @@ osm_l3: interconnect@18321000 {
#interconnect-cells = <1>;
};
- usb_hsphy_1: phy@88e2000 {
+ usb_1_hsphy: phy@88e2000 {
compatible = "qcom,qcs615-qusb2-phy";
reg = <0x0 0x88e2000 0x0 0x180>;
@@ -4319,7 +4319,7 @@ usb_hsphy_1: phy@88e2000 {
status = "disabled";
};
- usb_hsphy_2: phy@88e3000 {
+ usb_2_hsphy: phy@88e3000 {
compatible = "qcom,qcs615-qusb2-phy";
reg = <0x0 0x088e3000 0x0 0x180>;
@@ -4412,7 +4412,7 @@ usb_1_dwc3: usb@a600000 {
iommus = <&apps_smmu 0x140 0x0>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
- phys = <&usb_hsphy_1>, <&usb_qmpphy>;
+ phys = <&usb_1_hsphy>, <&usb_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";
snps,dis-u1-entry-quirk;
@@ -4476,7 +4476,7 @@ usb_2_dwc3: usb@a800000 {
iommus = <&apps_smmu 0xe0 0x0>;
interrupts = <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH>;
- phys = <&usb_hsphy_2>;
+ phys = <&usb_2_hsphy>;
phy-names = "usb2-phy";
snps,dis_u2_susphy_quirk;
(END)
};
- usb_hsphy_1: phy@88e2000 {
+ usb_1_hsphy: phy@88e2000 {
compatible = "qcom,qcs615-qusb2-phy";
reg = <0x0 0x88e2000 0x0 0x180>;
@@ -4319,7 +4319,7 @@ usb_hsphy_1: phy@88e2000 {
status = "disabled";
};
- usb_hsphy_2: phy@88e3000 {
+ usb_2_hsphy: phy@88e3000 {
compatible = "qcom,qcs615-qusb2-phy";
reg = <0x0 0x088e3000 0x0 0x180>;
@@ -4412,7 +4412,7 @@ usb_1_dwc3: usb@a600000 {
iommus = <&apps_smmu 0x140 0x0>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
- phys = <&usb_hsphy_1>, <&usb_qmpphy>;
+ phys = <&usb_1_hsphy>, <&usb_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";
snps,dis-u1-entry-quirk;
@@ -4476,7 +4476,7 @@ usb_2_dwc3: usb@a800000 {
iommus = <&apps_smmu 0xe0 0x0>;
interrupts = <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH>;
- phys = <&usb_hsphy_2>;
+ phys = <&usb_2_hsphy>;
phy-names = "usb2-phy";
snps,dis_u2_susphy_quirk;
Could you please confirm if this change aligns with your
expectation.
> Konrad
On 1/15/26 7:00 AM, tessolveupstream@gmail.com wrote: > > > On 14-01-2026 15:49, Konrad Dybcio wrote: >> On 1/14/26 11:00 AM, Sudarshan Shetty wrote: >>> The USB PHY nodes has inconsistent labels as 'usb_1_hspy' >>> and 'usb_hsphy_2' across talos.dtsi and qcs615-ride.dts. >>> This patch renames them to follow a consistent naming >>> scheme. [...] > Could you please confirm if this change aligns with your > expectation. Yes, thank you Konrad
© 2016 - 2026 Red Hat, Inc.