Skip to content

Commit 7caf092

Browse files
krzkandersson
authored andcommitted
ARM: dts: qcom: ipq4019: use generic node names for USB
Device node names should be generic which is also expected by USB bindings: qcom-ipq4018-jalapeno.dtb: dwc3@6000000: $nodename:0: 'dwc3@6000000' does not match '^usb(@.*)?' Override also the DWC3 node in qcom-ipq4018-ap120c-ac.dtsi by label/phandle, not via node path, because it is less error-prone and makes the overriding node-name independent. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20230619170151.65505-1-krzysztof.kozlowski@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 4bad24d commit 7caf092

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,11 @@
262262
&usb3 {
263263
status = "okay";
264264

265-
dwc3@8a00000 {
266-
phys = <&usb3_hs_phy>;
267-
phy-names = "usb2-phy";
268265
};
266+
267+
&usb3_dwc {
268+
phys = <&usb3_hs_phy>;
269+
phy-names = "usb2-phy";
269270
};
270271

271272
&usb2_hs_phy {

arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
};
622622
};
623623

624-
usb3_ss_phy: ssphy@9a000 {
624+
usb3_ss_phy: usb-phy@9a000 {
625625
compatible = "qcom,usb-ss-ipq4019-phy";
626626
#phy-cells = <0>;
627627
reg = <0x9a000 0x800>;
@@ -631,7 +631,7 @@
631631
status = "disabled";
632632
};
633633

634-
usb3_hs_phy: hsphy@a6000 {
634+
usb3_hs_phy: usb-phy@a6000 {
635635
compatible = "qcom,usb-hs-ipq4019-phy";
636636
#phy-cells = <0>;
637637
reg = <0xa6000 0x40>;
@@ -641,7 +641,7 @@
641641
status = "disabled";
642642
};
643643

644-
usb3: usb3@8af8800 {
644+
usb3: usb@8af8800 {
645645
compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";
646646
reg = <0x8af8800 0x100>;
647647
#address-cells = <1>;
@@ -653,7 +653,7 @@
653653
ranges;
654654
status = "disabled";
655655

656-
dwc3@8a00000 {
656+
usb3_dwc: usb@8a00000 {
657657
compatible = "snps,dwc3";
658658
reg = <0x8a00000 0xf8000>;
659659
interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
@@ -663,7 +663,7 @@
663663
};
664664
};
665665

666-
usb2_hs_phy: hsphy@a8000 {
666+
usb2_hs_phy: usb-phy@a8000 {
667667
compatible = "qcom,usb-hs-ipq4019-phy";
668668
#phy-cells = <0>;
669669
reg = <0xa8000 0x40>;
@@ -673,7 +673,7 @@
673673
status = "disabled";
674674
};
675675

676-
usb2: usb2@60f8800 {
676+
usb2: usb@60f8800 {
677677
compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";
678678
reg = <0x60f8800 0x100>;
679679
#address-cells = <1>;
@@ -685,7 +685,7 @@
685685
ranges;
686686
status = "disabled";
687687

688-
dwc3@6000000 {
688+
usb@6000000 {
689689
compatible = "snps,dwc3";
690690
reg = <0x6000000 0xf8000>;
691691
interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)