BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'keystone_dts_for_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt

Browse Source 
ARM: DTS: Keystone update for v5.12

Contains couple updates for DWC USB3 DT nodes

* tag 'keystone_dts_for_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  arm: dts: keystone: Harmonize DWC USB3 DT nodes name
  arm: dts: keystone: Correct DWC USB3 compatible string

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
This commit is contained in:
Arnd Bergmann committed 2021-02-02 17:59:36 +01:00
2 parents 528587ea03 091584182b
commit bc84e13f9b
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

arch/arm/boot/dts/keystone-k2e.dtsi
+3 -3
View File
@@ -52,7 +52,7 @@
usb: usb@2680000 {
interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
dwc3@2690000 {
usb@2690000 {
interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
};
};
@@ -78,8 +78,8 @@
dma-ranges;
status = "disabled";
usb1: dwc3@25010000 {
compatible = "synopsys,dwc3";
usb1: usb@25010000 {
compatible = "snps,dwc3";
reg = <0x25010000 0x70000>;
interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;
usb-phy = <&usb1_phy>, <&usb1_phy>;
arch/arm/boot/dts/keystone.dtsi
+2 -2
View File
@@ -217,8 +217,8 @@
dma-ranges;
status = "disabled";
usb0: dwc3@2690000 {
compatible = "synopsys,dwc3";
usb0: usb@2690000 {
compatible = "snps,dwc3";
reg = <0x2690000 0x70000>;
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
usb-phy = <&usb_phy>, <&usb_phy>;