diff options
| author | Subramaniam C.A <subramaniam.ca@ti.com> | 2011-05-31 09:24:49 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-31 11:06:20 +0100 |
| commit | 2a9d8f786814b7144537de8317f9cc3e00260f3a (patch) | |
| tree | 74c6ceed06c3aacc397e767bf1eedd9172e8aa88 /arch | |
| parent | 1a257217abe5b4c1f7fa156e5faef1a38415900f (diff) | |
SYSLINK: ipu-pm ported changes specific for 2.6.38 vanilla l-o kernel.
This patch adds vanilla l-o 2.6.38 specific changes. The patch might get
redundant once the OMAP_PM specific changes/ baseport changes go in.
Check the return value of kfifo_out ti avoid a warning
Do not use any constraint req/rel since the fwk is not
ready yet.
Signed-off-by: Miguel Vadillo <vadillo@ti.com>
Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
Signed-off-by: Cris Jansson <cjansson@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/ipu_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/ipu_dev.c b/arch/arm/mach-omap2/ipu_dev.c index a24ca10d367..8ffbfc40907 100644 --- a/arch/arm/mach-omap2/ipu_dev.c +++ b/arch/arm/mach-omap2/ipu_dev.c @@ -17,6 +17,7 @@ #include <mach/irqs.h> #include <plat/omap_hwmod.h> +#include <plat/common.h> #include <plat/omap_device.h> #include <plat/omap-pm.h> #include <linux/platform_device.h> @@ -89,7 +90,7 @@ inline int ipu_pm_module_set_rate(unsigned rsrc, unsigned target_rsrc, unsigned rate) { - int ret; + int ret = 0; unsigned target; struct device *dp; struct omap_ipupm_mod_platform_data *pd; @@ -114,8 +115,9 @@ inline int ipu_pm_module_set_rate(unsigned rsrc, } else dp = pd[target].dev; } - +#ifdef CONFIG_OMAP_PM ret = omap_device_set_rate(pd[rsrc].dev, dp, rate); +#endif if (ret) pr_err("device set rate failed %s", pd[target_rsrc].oh_name); err_ret: |