aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sh_mobile_meram.c
diff options
context:
space:
mode:
authorDamian Hobson-Garcia <dhobsong@igel.co.jp>2011-07-04 02:06:11 -0400
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-08-19 02:11:11 -0400
commit176737782e8360f1e577264c7aaeb691a7cbbfdd (patch)
tree30f7c7099c0f7e88a2943363acb7a619c6729680 /drivers/video/sh_mobile_meram.c
parent93ee7a9340d64f20295aacc3fb6a22b759323280 (diff)
fbdev: sh_mobile_meram: Enable runtime PM
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Diffstat (limited to 'drivers/video/sh_mobile_meram.c')
-rw-r--r--drivers/video/sh_mobile_meram.c5
1 files changed, 5 insertions, 0 deletions
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 @@
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/module.h> 13#include <linux/module.h>
14#include <linux/device.h> 14#include <linux/device.h>
15#include <linux/pm_runtime.h>
15#include <linux/io.h> 16#include <linux/io.h>
16#include <linux/slab.h> 17#include <linux/slab.h>
17#include <linux/platform_device.h> 18#include <linux/platform_device.h>
@@ -515,6 +516,8 @@ static int __devinit sh_mobile_meram_probe(struct platform_device *pdev)
515 if (pdata->addr_mode == SH_MOBILE_MERAM_MODE1) 516 if (pdata->addr_mode == SH_MOBILE_MERAM_MODE1)
516 meram_write_reg(priv->base, MEVCR1, 1 << 29); 517 meram_write_reg(priv->base, MEVCR1, 1 << 29);
517 518
519 pm_runtime_enable(&pdev->dev);
520
518 dev_info(&pdev->dev, "sh_mobile_meram initialized."); 521 dev_info(&pdev->dev, "sh_mobile_meram initialized.");
519 522
520 return 0; 523 return 0;
@@ -530,6 +533,8 @@ static int sh_mobile_meram_remove(struct platform_device *pdev)
530{ 533{
531 struct sh_mobile_meram_priv *priv = platform_get_drvdata(pdev); 534 struct sh_mobile_meram_priv *priv = platform_get_drvdata(pdev);
532 535
536 pm_runtime_disable(&pdev->dev);
537
533 if (priv->base) 538 if (priv->base)
534 iounmap(priv->base); 539 iounmap(priv->base);
535 540