diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-10-21 15:11:32 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-21 15:11:32 -0700 |
| commit | 35973186ff2db2e08bf0f5bd8d67b414be46e480 (patch) | |
| tree | 5fe0043652054d8aeff0dd09be1ce706e13cced7 /drivers/remoteproc | |
| parent | 7491e897fa88d10cfb4cc23be21aad5e1ed79d31 (diff) | |
| download | kernel_samsung_tuna-35973186ff2db2e08bf0f5bd8d67b414be46e480.zip kernel_samsung_tuna-35973186ff2db2e08bf0f5bd8d67b414be46e480.tar.gz kernel_samsung_tuna-35973186ff2db2e08bf0f5bd8d67b414be46e480.tar.bz2 | |
Revert "omap4: remoteproc: wake up clkdm in activate() to access iommu"
This reverts commit dc8f85b6b2e637752829caa706f769e53eb9ef73.
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/omap_remoteproc.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index d86b4b4..1e01a33 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -192,23 +192,13 @@ int omap_rproc_activate(struct omap_device *od) #ifdef CONFIG_REMOTE_PROC_AUTOSUSPEND struct omap_rproc_priv *rpp = rproc->priv; struct iommu *iommu; -#endif - /** - * Domain is in HW SUP thus in hw_auto but - * since remoteproc will be enabled clkdm - * needs to be in sw_sup (Do not let it idle). - */ - if (pdata->clkdm) - clkdm_wakeup(pdata->clkdm); -#ifdef CONFIG_REMOTE_PROC_AUTOSUSPEND if (!rpp->iommu) { iommu = iommu_get(pdata->iommu_name); if (IS_ERR(iommu)) { dev_err(dev, "iommu_get error: %ld\n", PTR_ERR(iommu)); - ret = PTR_ERR(iommu); - goto err; + return PTR_ERR(iommu); } rpp->iommu = iommu; } @@ -217,6 +207,14 @@ int omap_rproc_activate(struct omap_device *od) rpp->mbox = omap_mbox_get(pdata->sus_mbox_name, NULL); #endif + /** + * Domain is in HW SUP thus in hw_auto but + * since remoteproc will be enabled clkdm + * needs to be in sw_sup (Do not let it idle). + */ + if (pdata->clkdm) + clkdm_wakeup(pdata->clkdm); + for (i = 0; i < pdata->timers_cnt; i++) omap_dm_timer_start(timers[i].odt); @@ -228,7 +226,7 @@ int omap_rproc_activate(struct omap_device *od) break; } } -err: + /** * Domain is in force_wkup but since remoteproc * was enabled it is safe now to switch clkdm |