Commit 1f958f3d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name" 



This reverts commit eb9b7bfd as it
breaks working userspace implementations (i.e. Android systems)

The device node name here is part of configfs, so it is a user-visable
api that can not be changed.

Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/CALAqxLX_FNvFndEDWtGbFPjSzuAbfqxQE07diBJFZtftwEJX5A@mail.gmail.com


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

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

+2 −2
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ 
	status = "okay";

	extcon = <&usb2_id>;



	usb@7600000 {

	dwc3@7600000 {

		extcon = <&usb2_id>;

		dr_mode = "otg";

		maximum-speed = "high-speed";
@@ -1074,7 +1074,7 @@ 
	status = "okay";

	extcon = <&usb3_id>;



	usb@6a00000 {

	dwc3@6a00000 {

		extcon = <&usb3_id>;

		dr_mode = "otg";

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ 
			resets = <&gcc GCC_USB0_BCR>;

			status = "disabled";



			dwc_0: usb@8a00000 {

			dwc_0: dwc3@8a00000 {

				compatible = "snps,dwc3";

				reg = <0x8a00000 0xcd00>;

				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
@@ -484,7 +484,7 @@ 
			resets = <&gcc GCC_USB1_BCR>;

			status = "disabled";



			dwc_1: usb@8c00000 {

			dwc_1: dwc3@8c00000 {

				compatible = "snps,dwc3";

				reg = <0x8c00000 0xcd00>;

				interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

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

+2 −2
Original line number Diff line number Diff line
@@ -2566,7 +2566,7 @@ 
			power-domains = <&gcc USB30_GDSC>;

			status = "disabled";



			usb@6a00000 {

			dwc3@6a00000 {

				compatible = "snps,dwc3";

				reg = <0x06a00000 0xcc00>;

				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
@@ -2873,7 +2873,7 @@ 
			qcom,select-utmi-as-pipe-clk;

			status = "disabled";



			usb@7600000 {

			dwc3@7600000 {

				compatible = "snps,dwc3";

				reg = <0x07600000 0xcc00>;

				interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;

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

+1 −1
Original line number Diff line number Diff line
@@ -1964,7 +1964,7 @@ 


			resets = <&gcc GCC_USB_30_BCR>;



			usb3_dwc3: usb@a800000 {

			usb3_dwc3: dwc3@a800000 {

				compatible = "snps,dwc3";

				reg = <0x0a800000 0xcd00>;

				interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 
&usb3 {

	status = "okay";



	usb@7580000 {

	dwc3@7580000 {

		dr_mode = "host";

	};

};