diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 10:22:08 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 10:22:08 +0300 |
commit | bdac4d8abbfc239886103f7c6ee03abb8011a008 (patch) | |
tree | fda39ff9008b28d574ccd647f41a243183663127 /arch/arm64/boot/dts/qcom/qcs404.dtsi | |
parent | e7deeb9d79d8691f1e6c4c6707471ec3d7b9886b (diff) | |
parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
download | linux-bdac4d8abbfc239886103f7c6ee03abb8011a008.tar.xz |
Merge 5.14-rc3 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/boot/dts/qcom/qcs404.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index 9c4be020d568..339790ba585d 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -544,7 +544,7 @@ assigned-clock-rates = <19200000>, <200000000>; status = "disabled"; - usb@7580000 { + dwc3@7580000 { compatible = "snps,dwc3"; reg = <0x07580000 0xcd00>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -573,7 +573,7 @@ assigned-clock-rates = <19200000>, <133333333>; status = "disabled"; - usb@78c0000 { + dwc3@78c0000 { compatible = "snps,dwc3"; reg = <0x078c0000 0xcc00>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; |