UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] davinci: vpif: add pm_runtime support 

Add pm_runtime support to the TI Davinci VPIF driver.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2013-04-02 09:41:30 -03:00 committed by Mauro Carvalho Chehab
parent 3778d05036
commit 407ccc65bf
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/davinci/vpif.c
View File

@ -23,8 +23,8 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/pm_runtime.h>
#include <linux/v4l2-dv-timings.h> #include <linux/v4l2-dv-timings.h>
#include <mach/hardware.h> #include <mach/hardware.h>
@ -46,8 +46,6 @@ spinlock_t vpif_lock;
void __iomem *vpif_base; void __iomem *vpif_base;
EXPORT_SYMBOL_GPL(vpif_base); EXPORT_SYMBOL_GPL(vpif_base);
struct clk *vpif_clk;
/** /**
* vpif_ch_params: video standard configuration parameters for vpif * vpif_ch_params: video standard configuration parameters for vpif
* The table must include all presets from supported subdevices. * The table must include all presets from supported subdevices.
@ -443,19 +441,13 @@ static int vpif_probe(struct platform_device *pdev)
goto fail; goto fail;
} }
vpif_clk = clk_get(&pdev->dev, "vpif"); pm_runtime_enable(&pdev->dev);
if (IS_ERR(vpif_clk)) { pm_runtime_get(&pdev->dev);
status = PTR_ERR(vpif_clk);
goto clk_fail;
}
clk_prepare_enable(vpif_clk);
spin_lock_init(&vpif_lock); spin_lock_init(&vpif_lock);
dev_info(&pdev->dev, "vpif probe success\n"); dev_info(&pdev->dev, "vpif probe success\n");
return 0; return 0;
clk_fail:
iounmap(vpif_base);
fail: fail:
release_mem_region(res->start, res_len); release_mem_region(res->start, res_len);
return status; return status;
@ -463,11 +455,7 @@ fail:
static int vpif_remove(struct platform_device *pdev) static int vpif_remove(struct platform_device *pdev)
{ {
if (vpif_clk) { pm_runtime_disable(&pdev->dev);
clk_disable_unprepare(vpif_clk);
clk_put(vpif_clk);
}
iounmap(vpif_base); iounmap(vpif_base);
release_mem_region(res->start, res_len); release_mem_region(res->start, res_len);
return 0; return 0;
@ -476,13 +464,13 @@ static int vpif_remove(struct platform_device *pdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int vpif_suspend(struct device *dev) static int vpif_suspend(struct device *dev)
{ {
clk_disable_unprepare(vpif_clk); pm_runtime_put(dev);
return 0; return 0;
} }
static int vpif_resume(struct device *dev) static int vpif_resume(struct device *dev)
{ {
clk_prepare_enable(vpif_clk); pm_runtime_get(dev);
return 0; return 0;
} }