Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760594Ab1DPXqF (ORCPT ); Sat, 16 Apr 2011 19:46:05 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:55936 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760505Ab1DPXpF (ORCPT ); Sat, 16 Apr 2011 19:45:05 -0400 From: "Rafael J. Wysocki" To: Linux PM mailing list Subject: [PATCH 8/9] OMAP1 / PM: Use generic clock manipulation routines for runtime PM Date: Sun, 17 Apr 2011 01:43:28 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.39-rc3+; KDE/4.6.0; x86_64; ; ) Cc: Kevin Hilman , LKML , Grant Likely , Len Brown , linux-sh@vger.kernel.org, lethal@linux-sh.org, Magnus Damm , Alan Stern , Greg KH References: <201104130205.26988.rjw@sisk.pl> <201104170135.19388.rjw@sisk.pl> In-Reply-To: <201104170135.19388.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201104170143.28980.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3088 Lines: 116 From: Rafael J. Wysocki Convert OMAP1 to using the new generic clock manipulation routines and a device power domain for runtime PM instead of overriding the platform bus type's runtime PM callbacks. This allows us to simplify OMAP1-specific code and to share some code with other platforms (shmobile in particular). Signed-off-by: Rafael J. Wysocki --- arch/arm/mach-omap1/pm_bus.c | 63 +++++++++++++------------------------------ 1 file changed, 20 insertions(+), 43 deletions(-) Index: linux-2.6/arch/arm/mach-omap1/pm_bus.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap1/pm_bus.c +++ linux-2.6/arch/arm/mach-omap1/pm_bus.c @@ -24,23 +24,18 @@ #ifdef CONFIG_PM_RUNTIME static int omap1_pm_runtime_suspend(struct device *dev) { - struct clk *iclk, *fclk; - int ret = 0; + int ret; dev_dbg(dev, "%s\n", __func__); ret = pm_generic_runtime_suspend(dev); + if (ret) + return ret; - fclk = clk_get(dev, "fck"); - if (!IS_ERR(fclk)) { - clk_disable(fclk); - clk_put(fclk); - } - - iclk = clk_get(dev, "ick"); - if (!IS_ERR(iclk)) { - clk_disable(iclk); - clk_put(iclk); + ret = pm_runtime_clock_suspend(dev); + if (ret) { + pm_generic_runtime_resume(dev); + return ret; } return 0; @@ -48,23 +43,22 @@ static int omap1_pm_runtime_suspend(stru static int omap1_pm_runtime_resume(struct device *dev) { - struct clk *iclk, *fclk; - dev_dbg(dev, "%s\n", __func__); - iclk = clk_get(dev, "ick"); - if (!IS_ERR(iclk)) { - clk_enable(iclk); - clk_put(iclk); - } + pm_runtime_clock_resume(dev); + return pm_generic_runtime_resume(dev); +}; - fclk = clk_get(dev, "fck"); - if (!IS_ERR(fclk)) { - clk_enable(fclk); - clk_put(fclk); - } +static struct dev_power_domain default_power_domain = { + .ops = { + USE_PLATFORM_PM_SLEEP_OPS, + .runtime_suspend = omap1_pm_runtime_suspend, + .runtime_resume = omap1_pm_runtime_resume, + }, +}; - return pm_generic_runtime_resume(dev); +static struct pm_domain_notifier_block platform_bus_notifier = { + .pwr_domain = &default_power_domain, }; static int __init omap1_pm_runtime_init(void) @@ -75,24 +69,7 @@ static int __init omap1_pm_runtime_init( if (!cpu_class_is_omap1()) return -ENODEV; - pm = platform_bus_get_pm_ops(); - if (!pm) { - pr_err("%s: unable to get dev_pm_ops from platform_bus\n", - __func__); - return -ENODEV; - } - - omap_pm = kmemdup(pm, sizeof(struct dev_pm_ops), GFP_KERNEL); - if (!omap_pm) { - pr_err("%s: unable to alloc memory for new dev_pm_ops\n", - __func__); - return -ENOMEM; - } - - omap_pm->runtime_suspend = omap1_pm_runtime_suspend; - omap_pm->runtime_resume = omap1_pm_runtime_resume; - - platform_bus_set_pm_ops(omap_pm); + pm_runtim_clock_add_notifier(&platform_bus_type, &platform_bus_notifier); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/