]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux...
authorTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Mon, 18 May 2015 17:16:04 +0000 (12:16 -0500)
committerTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Mon, 18 May 2015 17:16:04 +0000 (12:16 -0500)
commited51b1f25310c6ec9d2f938b3e3ef6d819921931
treec758b17c72e742b05ac4dc814977b9264af253fa
parentdf47ad1ce42b415ac8b2f1c6cdb1a5d9181fb830
parenta8e2de0ffb1ce2571595191d2401d638e1caaf14
Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux-3.14.y

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>
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra74x.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/pdata-quirks.c