diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2011-12-13 10:02:10 +0100 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-12-20 16:46:27 +0100 |
| commit | 47d48434203fa15b5545990c2c272f908fb0fbe5 (patch) | |
| tree | 7ef3360861c7b5bf776ce9dd01aea63e28899caa /drivers | |
| parent | 634211da20578a42a28f627860c2707b4272bba0 (diff) | |
syslink: ipu_pm: update deprecated CONFIG_OMAP_PM
CONFIG_OMAP_PM => CONFIG_PM
Signed-off-by: Xavier Boudet <x-boudet@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dsp/syslink/ipu_pm/ipu_pm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dsp/syslink/ipu_pm/ipu_pm.c b/drivers/dsp/syslink/ipu_pm/ipu_pm.c index 637e3f568e5d..f1d7e5852395 100644 --- a/drivers/dsp/syslink/ipu_pm/ipu_pm.c +++ b/drivers/dsp/syslink/ipu_pm/ipu_pm.c @@ -305,7 +305,7 @@ static DECLARE_COMPLETION(ipu_clean_up_comp); static bool recover; /* Latency cstrs */ -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM static struct pm_qos_request_list *pm_qos_handle; static struct pm_qos_request_list *pm_qos_handle_2; #endif @@ -1259,7 +1259,7 @@ static inline int ipu_pm_get_iva_hd(struct ipu_pm_object *handle, params->pm_iva_hd_counter++; pr_debug("Request IVA_HD\n"); -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM pr_debug("Request MPU wakeup latency\n"); retval = omap_pm_set_max_mpu_wakeup_lat(&pm_qos_handle, IPU_PM_MM_MPU_LAT_CONSTRAINT); @@ -1439,7 +1439,7 @@ static inline int ipu_pm_get_iss(struct ipu_pm_object *handle, return PM_UNSUPPORTED; } -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM pr_debug("Request MPU wakeup latency\n"); retval = omap_pm_set_max_mpu_wakeup_lat(&pm_qos_handle, IPU_PM_MM_MPU_LAT_CONSTRAINT); @@ -1831,7 +1831,7 @@ static inline int ipu_pm_rel_iva_hd(struct ipu_pm_object *handle, params->pm_iva_hd_counter--; pr_debug("Release IVA_HD\n"); -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM if (params->pm_iva_hd_counter == 0 && params->pm_iss_counter == 0) { pr_debug("Release MPU wakeup latency\n"); retval = omap_pm_set_max_mpu_wakeup_lat(&pm_qos_handle, @@ -1946,7 +1946,7 @@ static inline int ipu_pm_rel_iss(struct ipu_pm_object *handle, params->pm_iss_counter--; pr_debug("Release ISS\n"); -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM if (params->pm_iva_hd_counter == 0 && params->pm_iss_counter == 0) { pr_debug("Release MPU wakeup latency\n"); retval = omap_pm_set_max_mpu_wakeup_lat(&pm_qos_handle, @@ -2446,7 +2446,7 @@ int ipu_pm_save_ctx(int proc_id) return 0; } -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM retval = omap_pm_set_max_sdma_lat(&pm_qos_handle_2, IPU_PM_NO_MPU_LAT_CONSTRAINT); if (retval) @@ -2566,7 +2566,7 @@ int ipu_pm_restore_ctx(int proc_id) /*cm_write_mod_reg(HW_AUTO, OMAP4430_CM2_CORE_MOD, OMAP4_CM_DUCATI_CLKSTCTRL_OFFSET);*/ -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM retval = omap_pm_set_max_sdma_lat(&pm_qos_handle_2, IPU_PM_MM_MPU_LAT_CONSTRAINT); if (retval) @@ -2621,7 +2621,7 @@ int ipu_pm_restore_ctx(int proc_id) /* turn on ducati hibernation timer */ ipu_pm_timer_state(PM_HIB_TIMER_ON); #endif -#ifdef CONFIG_OMAP_PM +#ifdef CONFIG_PM retval = omap_pm_set_max_sdma_lat(&pm_qos_handle_2, IPU_PM_MM_MPU_LAT_CONSTRAINT); if (retval) |