From patchwork Mon Dec 20 22:05:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tarun Kanti DebBarma X-Patchwork-Id: 419711 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBKB25Qb009977 for ; Mon, 20 Dec 2010 11:02:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755464Ab0LTLCF (ORCPT ); Mon, 20 Dec 2010 06:02:05 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:57845 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755421Ab0LTLB7 (ORCPT ); Mon, 20 Dec 2010 06:01:59 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id oBKB1u3f009976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 20 Dec 2010 05:01:59 -0600 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id oBKB1qtE025141; Mon, 20 Dec 2010 16:31:55 +0530 (IST) From: Tarun Kanti DebBarma To: linux-omap@vger.kernel.org Cc: Tarun Kanti DebBarma , Partha Basak Subject: [PATCH v7 10/12] OMAP: dmtimer: pm_runtime support Date: Tue, 21 Dec 2010 03:35:17 +0530 Message-Id: <1292882719-30255-11-git-send-email-tarun.kanti@ti.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1292882719-30255-1-git-send-email-tarun.kanti@ti.com> References: <1292882719-30255-1-git-send-email-tarun.kanti@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Dec 2010 11:02:07 +0000 (UTC) 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 #include #include +#include #include #include @@ -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;