From d1fbb4ecf79a4563de116d4c17d2a530ce14c337 Mon Sep 17 00:00:00 2001
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Date: Tue, 2 Apr 2013 09:41:30 -0300
Subject: [PATCH] --- yaml --- r: 367039 b: refs/heads/master c:
 407ccc65bfd2899ed008c4f8900f23ac15f75f9f h: refs/heads/master i:   367037:
 4167b14750807d53ef4b83846ad69104afe83c72   367035:
 31a4234aad50609ca43c8a286e05f08cc4dfe6fe   367031:
 8bbb1feb8e909c4a981590f5118641c6535a408c   367023:
 026a841c6f03eb6000dae9cbdf727e490b74bff0   367007:
 b182f3fb7cbca7403a8eb88e9f639c8bf232f06f   366975:
 3d45607541bafbaf78262ec49e5fdbca433ae1ee v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/platform/davinci/vpif.c | 24 ++++++---------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index f6c91d8b0ce7..2344d7564efe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3778d05036cc7ddd983ae2451da579af00acdac2
+refs/heads/master: 407ccc65bfd2899ed008c4f8900f23ac15f75f9f
diff --git a/trunk/drivers/media/platform/davinci/vpif.c b/trunk/drivers/media/platform/davinci/vpif.c
index 3bc4db8f0f27..ea82a8bd2803 100644
--- a/trunk/drivers/media/platform/davinci/vpif.c
+++ b/trunk/drivers/media/platform/davinci/vpif.c
@@ -23,8 +23,8 @@
 #include <linux/spinlock.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
-#include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/pm_runtime.h>
 #include <linux/v4l2-dv-timings.h>
 
 #include <mach/hardware.h>
@@ -46,8 +46,6 @@ spinlock_t vpif_lock;
 void __iomem *vpif_base;
 EXPORT_SYMBOL_GPL(vpif_base);
 
-struct clk *vpif_clk;
-
 /**
  * vpif_ch_params: video standard configuration parameters for vpif
  * The table must include all presets from supported subdevices.
@@ -443,19 +441,13 @@ static int vpif_probe(struct platform_device *pdev)
 		goto fail;
 	}
 
-	vpif_clk = clk_get(&pdev->dev, "vpif");
-	if (IS_ERR(vpif_clk)) {
-		status = PTR_ERR(vpif_clk);
-		goto clk_fail;
-	}
-	clk_prepare_enable(vpif_clk);
+	pm_runtime_enable(&pdev->dev);
+	pm_runtime_get(&pdev->dev);
 
 	spin_lock_init(&vpif_lock);
 	dev_info(&pdev->dev, "vpif probe success\n");
 	return 0;
 
-clk_fail:
-	iounmap(vpif_base);
 fail:
 	release_mem_region(res->start, res_len);
 	return status;
@@ -463,11 +455,7 @@ static int vpif_probe(struct platform_device *pdev)
 
 static int vpif_remove(struct platform_device *pdev)
 {
-	if (vpif_clk) {
-		clk_disable_unprepare(vpif_clk);
-		clk_put(vpif_clk);
-	}
-
+	pm_runtime_disable(&pdev->dev);
 	iounmap(vpif_base);
 	release_mem_region(res->start, res_len);
 	return 0;
@@ -476,13 +464,13 @@ static int vpif_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int vpif_suspend(struct device *dev)
 {
-	clk_disable_unprepare(vpif_clk);
+	pm_runtime_put(dev);
 	return 0;
 }
 
 static int vpif_resume(struct device *dev)
 {
-	clk_prepare_enable(vpif_clk);
+	pm_runtime_get(dev);
 	return 0;
 }