author | Tony Lindgren <tony@atomide.com> | |
Tue, 28 Nov 2017 16:12:32 +0000 (08:12 -0800) | ||
committer | Tony Lindgren <tony@atomide.com> | |
Tue, 28 Nov 2017 16:12:32 +0000 (08:12 -0800) |
Simple merge
diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge
diff --cc arch/arm/boot/dts/logicpd-som-lv.dtsi
Simple merge
diff --cc arch/arm/boot/dts/omap3-cm-t3x.dtsi
Simple merge
diff --cc arch/arm/boot/dts/omap3-evm-common.dtsi
Simple merge
diff --cc arch/arm/boot/dts/omap3-lilly-a83x.dtsi
Simple merge
Simple merge
diff --cc arch/arm/boot/dts/omap4.dtsi
index 27454b1c2fdfbe4164f559b66b6558c1b9b646c1,d24291ed9f6ab9cf685e13ff0c8dc4b9f552dc23..3bba7128b8f3e74c8292e09b6469afa534c56dcd
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
diff --cc arch/arm/boot/dts/omap5-cm-t54.dts
Simple merge
diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge