summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/qcom/sc7180.dtsi
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2021-08-17 02:02:26 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2021-08-17 02:02:26 +0300
commit198b8c8ede36d2135df73fee19506276059a0f8e (patch)
treebf6c582edf18fa1a14833e30eded74c722cd1179 /arch/arm64/boot/dts/qcom/sc7180.dtsi
parent97ec669dfcfa22f8a595356ceb6ce46e7b4a82e9 (diff)
parentff1176468d368232b684f75e82563369208bc371 (diff)
downloadlinux-198b8c8ede36d2135df73fee19506276059a0f8e.tar.xz
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>
Diffstat (limited to 'arch/arm64/boot/dts/qcom/sc7180.dtsi')
-rw-r--r--arch/arm64/boot/dts/qcom/sc7180.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 47b20ba69057..4721c155ec11 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -2761,7 +2761,7 @@
<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>;
interconnect-names = "usb-ddr", "apps-usb";
- usb_1_dwc3: usb@a600000 {
+ usb_1_dwc3: dwc3@a600000 {
compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xe000>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;