diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-10-21 15:13:48 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-21 15:13:48 -0700 |
| commit | 904f9b9f215d63d5191170a4423762fa56fc8e2a (patch) | |
| tree | 4f9222c21f69da3a3b38e015a2588bfefb660980 /drivers/remoteproc | |
| parent | ac5b3e5e80118f26c56d73b277f9c63c916f9a48 (diff) | |
| parent | fa61d097099db1ceb85a38b7123c625c4b02c769 (diff) | |
| download | kernel_samsung_tuna-904f9b9f215d63d5191170a4423762fa56fc8e2a.tar.gz kernel_samsung_tuna-904f9b9f215d63d5191170a4423762fa56fc8e2a.tar.bz2 kernel_samsung_tuna-904f9b9f215d63d5191170a4423762fa56fc8e2a.zip | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
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 7410e991674..5548917c6b1 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -193,23 +193,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; } @@ -218,6 +208,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); @@ -229,7 +227,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 |