Commit bc84e13f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone_dts_for_5.12' of... 

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

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/1612156910-11159-1-git-send-email-santosh.shilimkar@oracle.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 528587ea 09158418

arch/arm/boot/dts/keystone-k2e.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ &soc0 { 


		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 @@ keystone_usb1: usb@25000000 { 
			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
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ keystone_usb0: usb@2680000 { 
			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>;