author | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | |
Mon, 18 May 2015 17:16:04 +0000 (12:16 -0500) | ||
committer | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | |
Mon, 18 May 2015 17:16:04 +0000 (12:16 -0500) |
TI-Feature: rpmsg
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-3.14.y
* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
remoteproc/omap: add support for system suspend/resume
ARM: dts: DRA7: Add standby info for IPU & DSPs
ARM: dts: OMAP5: Add standby info for IPU and DSP
ARM: dts: OMAP4: Add standby info for IPU and DSP
Documentation: dt: update omap remoteproc binding for suspend
remoteproc/omap: use consistent match data structures for all SoCs
iommu/omap: add support for runtime auto suspend/resume
iommu/omap: add logic to save/restore locked TLBs
iommu/omap: introduce new API for suspend/resume
iommu/omap: streamline enable/disable through runtime pm callbacks
ARM: OMAP2+: add pdata-quirks for OMAP3 ISP IOMMU
ARM: OMAP2+: Add iommu pdata-quirks for DRA7 DSP EDMA MMUs
ARM: OMAP2+: plug in device_enable/idle ops for IOMMUs
iommu/omap: add pdata ops for omap_device_enable/idle
mailbox/omap: check for any unread messages during suspend
mailbox/omap: add support for suspend/resume
mailbox/omap: store mailbox interrupt type in omap_mbox_device
Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-3.14.y
* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
remoteproc/omap: add support for system suspend/resume
ARM: dts: DRA7: Add standby info for IPU & DSPs
ARM: dts: OMAP5: Add standby info for IPU and DSP
ARM: dts: OMAP4: Add standby info for IPU and DSP
Documentation: dt: update omap remoteproc binding for suspend
remoteproc/omap: use consistent match data structures for all SoCs
iommu/omap: add support for runtime auto suspend/resume
iommu/omap: add logic to save/restore locked TLBs
iommu/omap: introduce new API for suspend/resume
iommu/omap: streamline enable/disable through runtime pm callbacks
ARM: OMAP2+: add pdata-quirks for OMAP3 ISP IOMMU
ARM: OMAP2+: Add iommu pdata-quirks for DRA7 DSP EDMA MMUs
ARM: OMAP2+: plug in device_enable/idle ops for IOMMUs
iommu/omap: add pdata ops for omap_device_enable/idle
mailbox/omap: check for any unread messages during suspend
mailbox/omap: add support for suspend/resume
mailbox/omap: store mailbox interrupt type in omap_mbox_device
Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7.dtsi | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/dra74x.dtsi | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/omap4.dtsi | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/omap5.dtsi | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/pdata-quirks.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge
diff --cc arch/arm/boot/dts/dra74x.dtsi
Simple merge
diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge
diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge
diff --cc arch/arm/mach-omap2/pdata-quirks.c
Simple merge