Merge tag 'v5.14-rc3' into arm64-for-5.15
authorBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 16 Aug 2021 23:02:26 +0000 (18:02 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 16 Aug 2021 23:02:26 +0000 (18:02 -0500)
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>
1  2 
arch/arm64/boot/dts/qcom/ipq8074.dtsi
arch/arm64/boot/dts/qcom/msm8996.dtsi
arch/arm64/boot/dts/qcom/msm8998.dtsi
arch/arm64/boot/dts/qcom/sc7180.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/boot/dts/qcom/sm8150.dtsi

Simple merge
index 31686950004ed0b06dde9ed509a9ecd547a902e6,78c55ca10ba9b119fb8a2e89a2fe49dfb815f2c2..52df22ab3f6aeb9cc4d59a5f49c7b0e7e508960f
                        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>;
Simple merge
Simple merge
Simple merge
Simple merge