From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Mon, 4 Jul 2011 06:06:11 +0000 (+0200)
Subject: fbdev: sh_mobile_meram: Enable runtime PM
X-Git-Tag: next-20110831~35^2^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=176737782e8360f1e577264c7aaeb691a7cbbfdd;p=karo-tx-linux.git

fbdev: sh_mobile_meram: Enable runtime PM

Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
---

diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index cc7d7329dc15..34efd8a29f59 100644
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/pm_runtime.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
@@ -515,6 +516,8 @@ static int __devinit sh_mobile_meram_probe(struct platform_device *pdev)
 	if (pdata->addr_mode == SH_MOBILE_MERAM_MODE1)
 		meram_write_reg(priv->base, MEVCR1, 1 << 29);
 
+	pm_runtime_enable(&pdev->dev);
+
 	dev_info(&pdev->dev, "sh_mobile_meram initialized.");
 
 	return 0;
@@ -530,6 +533,8 @@ static int sh_mobile_meram_remove(struct platform_device *pdev)
 {
 	struct sh_mobile_meram_priv *priv = platform_get_drvdata(pdev);
 
+	pm_runtime_disable(&pdev->dev);
+
 	if (priv->base)
 		iounmap(priv->base);