Commit 7caf0921 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230619170151.65505-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 4bad24d7

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

+4 −3
Original line number Diff line number Diff line
@@ -262,11 +262,12 @@ &usb3_hs_phy { 
&usb3 {

	status = "okay";



	dwc3@8a00000 {

	};



&usb3_dwc {

	phys = <&usb3_hs_phy>;

	phy-names = "usb2-phy";

};

};



&usb2_hs_phy {

	status = "okay";

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

+7 −7
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ ethphy4: ethernet-phy@4 { 
			};

		};



		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 @@ usb3_ss_phy: ssphy@9a000 { 
			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 @@ usb3_hs_phy: hsphy@a6000 { 
			status = "disabled";

		};



		usb3: usb3@8af8800 {

		usb3: usb@8af8800 {

			compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";

			reg = <0x8af8800 0x100>;

			#address-cells = <1>;
@@ -653,7 +653,7 @@ usb3: usb3@8af8800 { 
			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 @@ dwc3@8a00000 { 
			};

		};



		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 @@ usb2_hs_phy: hsphy@a8000 { 
			status = "disabled";

		};



		usb2: usb2@60f8800 {

		usb2: usb@60f8800 {

			compatible = "qcom,ipq4019-dwc3", "qcom,dwc3";

			reg = <0x60f8800 0x100>;

			#address-cells = <1>;
@@ -685,7 +685,7 @@ usb2: usb2@60f8800 { 
			ranges;

			status = "disabled";



			dwc3@6000000 {

			usb@6000000 {

				compatible = "snps,dwc3";

				reg = <0x6000000 0xf8000>;

				interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;