From: Tony Lindgren <tony@atomide.com>
Date: Tue, 28 Nov 2017 16:12:32 +0000 (-0800)
Subject: Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
X-Git-Tag: v4.15-rc3~4^2~2^2~1^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc686442f8a601bccac1f22506ecdb4b0d62cadd;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
---

bc686442f8a601bccac1f22506ecdb4b0d62cadd
diff --cc arch/arm/boot/dts/omap4.dtsi
index 27454b1c2fdfb,d24291ed9f6ab..3bba7128b8f3e
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -1081,9 -1081,7 +1081,8 @@@
  			usbhsohci: ohci@4a064800 {
  				compatible = "ti,ohci-omap3";
  				reg = <0x4a064800 0x400>;
- 				interrupt-parent = <&gic>;
  				interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
 +				remote-wakeup-connected;
  			};
  
  			usbhsehci: ehci@4a064c00 {