diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-10-22 23:53:21 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-10-22 23:53:21 -0500 |
| commit | 00fd50e342cb085dbab41ea525973920dfd61e61 (patch) | |
| tree | 8250f90fca2e1a4db66b9d34982d88bc89bb7c80 /drivers/remoteproc | |
| parent | 6113feb603f4b14dc1e1be3d1b9d65d2b84324a8 (diff) | |
| parent | b090684b8b8e01674cdf94cf38e2fe8f5d7193aa (diff) | |
| download | kernel_samsung_espresso10-00fd50e342cb085dbab41ea525973920dfd61e61.zip kernel_samsung_espresso10-00fd50e342cb085dbab41ea525973920dfd61e61.tar.gz kernel_samsung_espresso10-00fd50e342cb085dbab41ea525973920dfd61e61.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
* android-omap-3.0:
omap2plus: cpufreq: suspend scaling during system suspend
ARM: omap4: disable PL310 double linefill
Revert "omap4: remoteproc: wake up clkdm in activate() to access iommu"
usb: host: ehci: add wmb after modifying qtd pointer
omap4: remoteproc: wake up clkdm in activate() to access iommu
remoteproc: disable autosuspend when enter secure mode
Conflicts:
arch/arm/mach-omap2/omap2plus-cpufreq.c
Change-Id: I6d3d85f8582640c4e7929f62ca15219e512d5195
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/remoteproc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/remoteproc/remoteproc.c b/drivers/remoteproc/remoteproc.c index 680a701..907fc01 100644 --- a/drivers/remoteproc/remoteproc.c +++ b/drivers/remoteproc/remoteproc.c @@ -675,7 +675,8 @@ static void rproc_start(struct rproc *rproc, u64 bootaddr) pm_runtime_set_autosuspend_delay(dev, rproc->sus_timeout); pm_runtime_get_noresume(rproc->dev); pm_runtime_set_active(rproc->dev); - pm_runtime_enable(rproc->dev); + if (!rproc->secure_mode) + pm_runtime_enable(rproc->dev); pm_runtime_mark_last_busy(rproc->dev); pm_runtime_put_autosuspend(rproc->dev); #endif @@ -1340,7 +1341,9 @@ void rproc_put(struct rproc *rproc) */ pm_runtime_get_sync(rproc->dev); pm_runtime_put_noidle(rproc->dev); - pm_runtime_disable(rproc->dev); + if (!rproc->secure_reset) + pm_runtime_disable(rproc->dev); + pm_runtime_set_suspended(rproc->dev); #endif ret = rproc->ops->stop(rproc); |