diff options
| author | Dmytro Kedrovskyi <x0169235@ti.com> | 2012-08-07 18:51:21 +0300 |
|---|---|---|
| committer | Dmytro Kedrovskyi <x0169235@ti.com> | 2012-08-07 18:51:21 +0300 |
| commit | d9090683f4ec573cfe0725803c691ab638294446 (patch) | |
| tree | ec6017add1b6c09e5177c0f96e3db87f3e315776 | |
| parent | 3628f84f053684abf4389ef77aeb9262497039dd (diff) | |
| download | kernel_samsung_espresso10-d9090683f4ec573cfe0725803c691ab638294446.zip kernel_samsung_espresso10-d9090683f4ec573cfe0725803c691ab638294446.tar.gz kernel_samsung_espresso10-d9090683f4ec573cfe0725803c691ab638294446.tar.bz2 | |
Revert ducati 2.1.13 prerequisites: 62f1b46 and 6b4fc47
Change-Id: I0f07e29efb5d8f3702fd3d8e866153788571f308
Signed-off-by: Dmytro Kedrovskyi <x0169235@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/omap4_ion.c | 2 | ||||
| -rw-r--r-- | drivers/remoteproc/omap_remoteproc.c | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/omap4_ion.c b/arch/arm/mach-omap2/omap4_ion.c index d4230d8..734a9b5 100644 --- a/arch/arm/mach-omap2/omap4_ion.c +++ b/arch/arm/mach-omap2/omap4_ion.c @@ -120,7 +120,7 @@ void __init omap_ion_init(void) } else { omap4_ion_heap_secure_input_size = (SZ_1M * 90); omap4_ion_heap_secure_output_wfdhdcp_size = (SZ_1M * 16); - omap4_ducati_heap_size = (SZ_1M * 107); + omap4_ducati_heap_size = (SZ_1M * 105); omap4_ion_heap_nonsec_tiler_mem_size = nonsecure; omap4_ion_heap_tiler_mem_size = (ALIGN(omap4_ion_pdata.tiler2d_size + diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index 62c8702..4d66af2 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -35,7 +35,6 @@ #include "../../arch/arm/mach-omap2/clockdomain.h" #define PM_SUSPEND_MBOX 0xffffff07 -#define PM_SUSPEND_MBOX_FORCE 0xffffff09 #define PM_SUSPEND_TIMEOUT 300 struct omap_rproc_priv { @@ -58,14 +57,11 @@ static bool _may_suspend(struct omap_rproc_priv *rpp) return readl(rpp->idle) & rpp->idle_mask; } -static int _suspend(struct omap_rproc_priv *rpp, bool force) +static int _suspend(struct omap_rproc_priv *rpp) { unsigned long timeout = msecs_to_jiffies(PM_SUSPEND_TIMEOUT) + jiffies; - if (force) - omap_mbox_msg_send(rpp->mbox, PM_SUSPEND_MBOX_FORCE); - else - omap_mbox_msg_send(rpp->mbox, PM_SUSPEND_MBOX); + omap_mbox_msg_send(rpp->mbox, PM_SUSPEND_MBOX); while (time_after(timeout, jiffies)) { if ((readl(rpp->suspend) & rpp->suspend_mask) && @@ -82,7 +78,7 @@ static int omap_suspend(struct rproc *rproc, bool force) struct omap_rproc_priv *rpp = rproc->priv; if (rpp->idle && (force || _may_suspend(rpp))) - return _suspend(rpp, force); + return _suspend(rpp); return -EBUSY; } |