Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
authorTony Lindgren <tony@atomide.com>
Tue, 28 Nov 2017 16:12:32 +0000 (08:12 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Nov 2017 16:12:32 +0000 (08:12 -0800)
1  2 
Documentation/devicetree/bindings/usb/am33xx-usb.txt
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/logicpd-som-lv.dtsi
arch/arm/boot/dts/omap3-cm-t3x.dtsi
arch/arm/boot/dts/omap3-evm-common.dtsi
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
arch/arm/boot/dts/omap4-panda-common.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-board-common.dtsi
arch/arm/boot/dts/omap5-cm-t54.dts
arch/arm/boot/dts/omap5.dtsi

Simple merge
Simple merge
Simple merge
                        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 {
Simple merge
Simple merge