All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
To: linux-omap@vger.kernel.org
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>,
	Partha Basak <p-basak2@ti.com>
Subject: [PATCH v7 10/12] OMAP: dmtimer: pm_runtime support
Date: Tue, 21 Dec 2010 03:35:17 +0530	[thread overview]
Message-ID: <1292882719-30255-11-git-send-email-tarun.kanti@ti.com> (raw)
In-Reply-To: <1292882719-30255-1-git-send-email-tarun.kanti@ti.com>

Add pm_runtime support to dmtimer. Since dmtimer is used during
early boot before pm_runtime is initialized completely there are
provisions to enable/disable clocks directly in the code during
early boot.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
[p-basak2@ti.com: added pm_runtime logic in probe()]
Signed-off-by: Partha Basak <p-basak2@ti.com>
Reviewed-by: Varadarajan, Charulatha <charu@ti.com>
Acked-by: Cousson, Benoit <b-cousson@ti.com>
---
 arch/arm/plat-omap/dmtimer.c |   60 +++++++++++++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index b66f122..0fcc242 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -39,6 +39,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 #include <linux/err.h>
 #include <plat/dmtimer.h>
 
@@ -212,13 +213,16 @@ static void omap_dm_timer_prepare(struct omap_dm_timer *timer)
 {
 	struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
 
-	timer->fclk = clk_get(&timer->pdev->dev, "fck");
-	if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
-		dev_err(&timer->pdev->dev, ": No fclk handle.\n");
-		return;
+	if (!pdata->is_omap16xx) {
+		timer->fclk = clk_get(&timer->pdev->dev, "fck");
+		if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
+			dev_err(&timer->pdev->dev, ": No fclk handle.\n");
+			return;
+		}
 	}
 
-	omap_dm_timer_enable(timer);
+	if (!pdata->is_omap16xx)
+		omap_dm_timer_enable(timer);
 
 	if (pdata->dm_timer_reset)
 		pdata->dm_timer_reset(timer);
@@ -293,10 +297,22 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_free);
 
 void omap_dm_timer_enable(struct omap_dm_timer *timer)
 {
+	struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
+
 	if (timer->enabled)
 		return;
 
-	clk_enable(timer->fclk);
+	if (unlikely(pdata->is_early_init)) {
+		clk_enable(timer->fclk);
+		timer->enabled = 1;
+		return;
+	}
+
+	if (pm_runtime_get_sync(&timer->pdev->dev) < 0) {
+		dev_err(&timer->pdev->dev, "%s: pm_runtime_get_sync() FAILED\n",
+			__func__);
+		return;
+	}
 
 	timer->enabled = 1;
 }
@@ -304,10 +320,22 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_enable);
 
 void omap_dm_timer_disable(struct omap_dm_timer *timer)
 {
+	struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
+
 	if (!timer->enabled)
 		return;
 
-	clk_disable(timer->fclk);
+	if (unlikely(pdata->is_early_init)) {
+		clk_disable(timer->fclk);
+		timer->enabled = 0;
+		return;
+	}
+
+	if (pm_runtime_put_sync(&timer->pdev->dev) < 0) {
+		dev_err(&timer->pdev->dev, "%s: pm_runtime_put_sync() FAILED\n",
+			__func__);
+		return;
+	}
 
 	timer->enabled = 0;
 }
@@ -425,12 +453,14 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
 	if (source < 0 || source >= 3)
 		return -EINVAL;
 
-	omap_dm_timer_disable(timer);
+	if (!pdata->is_omap16xx)
+		omap_dm_timer_disable(timer);
 
 	/* change the timer clock source */
 	ret = pdata->set_timer_src(timer->pdev, source);
 
-	omap_dm_timer_enable(timer);
+	if (!pdata->is_omap16xx)
+		omap_dm_timer_enable(timer);
 
 	/*
 	 * When the functional clock disappears, too quick writes seem
@@ -604,11 +634,21 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
+	/* OMAP2+
+	 * Early timers are already registered and in list.
+	 * What we need to do during second phase of probe
+	 * is to assign the newly allocated/configured pdev
+	 * to timer->pdev. We also call pm_runtime_enable()
+	 * for each device because it could not be called
+	 * during early boot because pm_runtime framework
+	 * was not yet up and running.
+	 */
 	spin_lock_irqsave(&dm_timer_lock, flags);
 	list_for_each_entry(timer, &omap_timer_list, node)
 		if (!pdata->is_early_init && timer->id == pdev->id) {
 			timer->pdev = pdev;
 			spin_unlock_irqrestore(&dm_timer_lock, flags);
+			pm_runtime_enable(&pdev->dev);
 			dev_dbg(&pdev->dev, "Regular Probed\n");
 			return 0;
 		}
@@ -659,6 +699,8 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
 		pdata->dm_timer_read_reg = omap_dm_timer_read_reg;
 		pdata->dm_timer_write_reg = omap_dm_timer_write_reg;
 		pdata->is_early_init = 0;
+		pm_runtime_enable(&pdev->dev);
+		dev_dbg(&pdev->dev, " pm_runtime enabled\n");
 	}
 
 	timer->id = pdev->id;
-- 
1.6.0.4


  parent reply	other threads:[~2010-12-20 11:01 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-20 22:05 [PATCH v7 0/12] dmtimer adaptation to platform_driver Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 1/12] OMAP2+: dmtimer: add device names to flck nodes Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 2/12] OMAP2420: hwmod data: add dmtimer Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 3/12] OMAP2430: " Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 4/12] OMAP3: " Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 5/12] OMAP4: " Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 6/12] OMAP1: dmtimer: conversion to platform devices Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 7/12] OMAP2+: dmtimer: convert " Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 8/12] OMAP: dmtimer: platform driver Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 9/12] OMAP: dmtimer: switch-over to platform device driver Tarun Kanti DebBarma
2010-12-20 22:05 ` Tarun Kanti DebBarma [this message]
2010-12-20 22:05 ` [PATCH v7 11/12] OMAP: dmtimer: add timeout to low-level routines Tarun Kanti DebBarma
2010-12-20 22:05 ` [PATCH v7 12/12] OMAP2: dmtimer: set wakeup enable explicitly in plat Tarun Kanti DebBarma
2010-12-20 23:11   ` Cousson, Benoit
2010-12-20 23:46     ` Kevin Hilman
2010-12-22 11:31     ` DebBarma, Tarun Kanti
2010-12-23 10:52       ` DebBarma, Tarun Kanti
2011-01-03  7:31       ` DebBarma, Tarun Kanti

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1292882719-30255-11-git-send-email-tarun.kanti@ti.com \
    --to=tarun.kanti@ti.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=p-basak2@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.