From patchwork Thu Oct 23 14:23:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 5140931 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E717E9F30B for ; Thu, 23 Oct 2014 14:24:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15D682024F for ; Thu, 23 Oct 2014 14:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3961C20253 for ; Thu, 23 Oct 2014 14:24:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932657AbaJWOX4 (ORCPT ); Thu, 23 Oct 2014 10:23:56 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:53068 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932178AbaJWOXv (ORCPT ); Thu, 23 Oct 2014 10:23:51 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s9NENEFN012594; Thu, 23 Oct 2014 09:23:14 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9NENEsL023276; Thu, 23 Oct 2014 09:23:14 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Thu, 23 Oct 2014 09:23:14 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9NENDLB008133; Thu, 23 Oct 2014 09:23:14 -0500 From: Grygorii Strashko To: , "Rafael J. Wysocki" , CC: , Rob Herring , , , , , Grygorii Strashko , Ulf Hansson , Geert Uytterhoeven , Dmitry Torokhov Subject: [PATCH v3 3/5] PM / clock_ops: add and enable clocks always if !CONFIG_PM_RUNTIME Date: Thu, 23 Oct 2014 17:23:00 +0300 Message-ID: <1414074182-25980-4-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414074182-25980-1-git-send-email-grygorii.strashko@ti.com> References: <1414074182-25980-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Device's clocks need to be enabled always at probing time if !CONFIG_PM_RUNTIME - in that way, device will become accessible and, later, its clocks can be disabled/enabled during system suspend/resume by using pm_clk_suspend/pm_clk_resume APIs. But now, the clocks management code doesn't enable clocks when clocks are being registered per-device by using pm_clk_add/_clk(). So, update pm_clk_acquire(), which is called from pm_clk_add/_clk(), to enable clocks always if !CONFIG_PM_RUNTIME. Also, Platform PM domains drivers will not need to add code like below each time they need to handle the case when !CONFIG_PM_RUNTIME [1 - 3]: if (!IS_ENABLED(CONFIG_PM_RUNTIME)) { ret = pm_clk_resume(dev); if (ret) { dev_err(dev, "pm_clk_resume failed %d\n", ret); goto clk_err; }; } [1] https://lkml.org/lkml/2014/10/3/306 [2] https://lkml.org/lkml/2014/10/16/305 [3] https://lkml.org/lkml/2014/10/20/249 CC: Santosh Shilimkar CC: Kevin Hilman CC: Ulf Hansson CC: Geert Uytterhoeven CC: Dmitry Torokhov Signed-off-by: Grygorii Strashko --- drivers/base/power/clock_ops.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index c3b44c1..87d07dc 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -68,6 +68,10 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce) ce->status = PCE_STATUS_ACQUIRED; dev_dbg(dev, "Clock %s managed by runtime PM.\n", ce->con_id); } + + if (!IS_ENABLED(CONFIG_PM_RUNTIME)) { + __pm_clk_enable(dev, ce); + } } static int __pm_clk_add(struct device *dev, const char *con_id,