From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Mon, 16 Aug 2021 23:02:26 +0000 (-0500)
Subject: Merge tag 'v5.14-rc3' into arm64-for-5.15
X-Git-Tag: libata-5.15-2021-09-05~34^2~7^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=198b8c8ede36d2135df73fee19506276059a0f8e;p=linux-block.git

Merge tag 'v5.14-rc3' into arm64-for-5.15

The USB maintainer felt the strong need to push '1f958f3dff42
("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"")'
through the usb tree, so merge v5.14-rc3 to resolve the resulting merge
conflicts.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

198b8c8ede36d2135df73fee19506276059a0f8e
diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi
index 31686950004e,78c55ca10ba9..52df22ab3f6a
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@@ -2572,7 -2566,7 +2572,7 @@@
  			power-domains = <&gcc USB30_GDSC>;
  			status = "disabled";
  
- 			usb3_dwc3: usb@6a00000 {
 -			dwc3@6a00000 {
++			usb3_dwc3: dwc3@6a00000 {
  				compatible = "snps,dwc3";
  				reg = <0x06a00000 0xcc00>;
  				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;