Commit b77a1c4d authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

arm64: dts: qcom: correct DWC3 node names and unit addresses 



Align DWC3 USB node names with DT schema ("usb" is expected) and correct
the unit addresses to match the "reg" property.  This also implies
overriding nodes by label, instead of full path.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220504131923.214367-7-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16946a60

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

+9 −9
Original line number Diff line number Diff line
@@ -1046,23 +1046,23 @@ &ufshc { 
&usb2 {

	status = "okay";

	extcon = <&usb2_id>;

};



	dwc3@7600000 {

&usb2_dwc3 {

	extcon = <&usb2_id>;

	dr_mode = "otg";

	maximum-speed = "high-speed";

};

};



&usb3 {

	status = "okay";

	extcon = <&usb3_id>;

};



	dwc3@6a00000 {

&usb3_dwc3 {

	extcon = <&usb3_id>;

	dr_mode = "otg";

};

};



&usb3phy {

	status = "okay";

arch/arm64/boot/dts/qcom/ipq6018.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ qusb_phy_1: qusb@59000 { 
			status = "disabled";

		};



		usb2: usb2@7000000 {

		usb2: usb@70f8800 {

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

			reg = <0x0 0x070F8800 0x0 0x400>;

			#address-cells = <2>;
@@ -720,7 +720,7 @@ qusb_phy_0: qusb@79000 { 
			status = "disabled";

		};



		usb3: usb3@8A00000 {

		usb3: usb@8af8800 {

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

			reg = <0x0 0x8AF8800 0x0 0x400>;

			#address-cells = <2>;
@@ -746,7 +746,7 @@ usb3: usb3@8A00000 { 
			resets = <&gcc GCC_USB0_BCR>;

			status = "disabled";



			dwc_0: usb@8A00000 {

			dwc_0: usb@8a00000 {

				compatible = "snps,dwc3";

				reg = <0x0 0x8A00000 0x0 0xcd00>;

				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/ipq8074.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ usb_0: usb@8af8800 { 
			resets = <&gcc GCC_USB0_BCR>;

			status = "disabled";



			dwc_0: dwc3@8a00000 {

			dwc_0: usb@8a00000 {

				compatible = "snps,dwc3";

				reg = <0x8a00000 0xcd00>;

				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
@@ -618,7 +618,7 @@ usb_1: usb@8cf8800 { 
			resets = <&gcc GCC_USB1_BCR>;

			status = "disabled";



			dwc_1: dwc3@8c00000 {

			dwc_1: usb@8c00000 {

				compatible = "snps,dwc3";

				reg = <0x8c00000 0xcd00>;

				interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -296,8 +296,9 @@ &usb3 { 
	extcon = <&typec>;



	qcom,select-utmi-as-pipe-clk;

};



	dwc3@6a00000 {

&usb3_dwc3 {

	extcon = <&typec>;



	/* usb3-phy is not used on this device */
@@ -309,7 +310,6 @@ dwc3@6a00000 { 
	snps,usb2-gadget-lpm-disable;

	snps,hird-threshold = /bits/ 8 <0>;

};

};



&hsusb_phy1 {

	status = "okay";

arch/arm64/boot/dts/qcom/msm8996.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -2625,7 +2625,7 @@ usb3: usb@6af8800 { 
			power-domains = <&gcc USB30_GDSC>;

			status = "disabled";



			usb3_dwc3: dwc3@6a00000 {

			usb3_dwc3: usb@6a00000 {

				compatible = "snps,dwc3";

				reg = <0x06a00000 0xcc00>;

				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
@@ -2953,7 +2953,7 @@ usb2: usb@76f8800 { 
			qcom,select-utmi-as-pipe-clk;

			status = "disabled";



			dwc3@7600000 {

			usb2_dwc3: usb@7600000 {

				compatible = "snps,dwc3";

				reg = <0x07600000 0xcc00>;

				interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;