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>

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
index d90b4f4c63afe3cf124307f87aca970c223beb7b..da67d55fa55730f848b2a0070d909a67d30b84c0 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
@@ -262,10 +262,11 @@
 &usb3 {
        status = "okay";
 
-       dwc3@8a00000 {
-               phys = <&usb3_hs_phy>;
-               phy-names = "usb2-phy";
        };
+
+&usb3_dwc {
+       phys = <&usb3_hs_phy>;
+       phy-names = "usb2-phy";
 };
 
 &usb2_hs_phy {

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
index f0ef86fadc9d9a70bc1a99b63a6b861a7ae90fbd..13388e5c1b4bd3c354a51c982f1f624f1531861f 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
@@ -621,7 +621,7 @@
                        };
                };
 
-               usb3_ss_phy: ssphy@9a000 {
+               usb3_ss_phy: usb-phy@9a000 {
                        compatible = "qcom,usb-ss-ipq4019-phy";
                        #phy-cells = <0>;
                        reg = <0x9a000 0x800>;
@@ -631,7 +631,7 @@
                        status = "disabled";
                };
 
-               usb3_hs_phy: hsphy@a6000 {
+               usb3_hs_phy: usb-phy@a6000 {
                        compatible = "qcom,usb-hs-ipq4019-phy";
                        #phy-cells = <0>;
                        reg = <0xa6000 0x40>;
@@ -641,7 +641,7 @@
                        status = "disabled";
                };
 
-               usb3: usb3@8af8800 {
+               usb3: usb@8af8800 {
                        compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";
                        reg = <0x8af8800 0x100>;
                        #address-cells = <1>;
@@ -653,7 +653,7 @@
                        ranges;
                        status = "disabled";
 
-                       dwc3@8a00000 {
+                       usb3_dwc: usb@8a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x8a00000 0xf8000>;
                                interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
@@ -663,7 +663,7 @@
                        };
                };
 
-               usb2_hs_phy: hsphy@a8000 {
+               usb2_hs_phy: usb-phy@a8000 {
                        compatible = "qcom,usb-hs-ipq4019-phy";
                        #phy-cells = <0>;
                        reg = <0xa8000 0x40>;
@@ -673,7 +673,7 @@
                        status = "disabled";
                };
 
-               usb2: usb2@60f8800 {
+               usb2: usb@60f8800 {
                        compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";
                        reg = <0x60f8800 0x100>;
                        #address-cells = <1>;
@@ -685,7 +685,7 @@
                        ranges;
                        status = "disabled";
 
-                       dwc3@6000000 {
+                       usb@6000000 {
                                compatible = "snps,dwc3";
                                reg = <0x6000000 0xf8000>;
                                interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;