From patchwork Mon Apr 18 19:57:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 716401 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 p3IJuwfV005701 for ; Mon, 18 Apr 2011 19:56:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751472Ab1DRT45 (ORCPT ); Mon, 18 Apr 2011 15:56:57 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:32865 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282Ab1DRT45 (ORCPT ); Mon, 18 Apr 2011 15:56:57 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 198CF1A7420; Mon, 18 Apr 2011 21:57:25 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04132-02; Mon, 18 Apr 2011 21:57:07 +0200 (CEST) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 39E811A715B; Mon, 18 Apr 2011 21:57:07 +0200 (CEST) From: "Rafael J. Wysocki" To: Paul Mundt Subject: Re: [PATCH 8/9] OMAP1 / PM: Use generic clock manipulation routines for runtime PM Date: Mon, 18 Apr 2011 21:57:28 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.39-rc3+; KDE/4.6.0; x86_64; ; ) Cc: Linux PM mailing list , Kevin Hilman , LKML , Grant Likely , Len Brown , linux-sh@vger.kernel.org, Magnus Damm , Alan Stern , Greg KH References: <201104130205.26988.rjw@sisk.pl> <201104170143.28980.rjw@sisk.pl> <20110418081809.GA32457@linux-sh.org> In-Reply-To: <20110418081809.GA32457@linux-sh.org> MIME-Version: 1.0 Message-Id: <201104182157.28373.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 19:56:58 +0000 (UTC) On Monday, April 18, 2011, Paul Mundt wrote: > On Sun, Apr 17, 2011 at 01:43:28AM +0200, Rafael J. Wysocki wrote: > > @@ -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); > > > Presumably you meant pm_runtime_clock_add_notifier() here. You seem to > have the same typo in a few other places too. Yes, in fact I have fixed those typos (and a build problem in [7/9] for CONFIG_HAVE_CLK unset) already. Corrected patch is appended, but it depends on the fixed [7/9] (I'll send it in a little while). Thanks, Rafael --- From: Rafael J. Wysocki Subject: OMAP1 / PM: Use generic clock manipulation routines for runtime PM 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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_runtime_clock_add_notifier(&platform_bus_type, &platform_bus_notifier); return 0; }