From patchwork Thu Sep 25 16:28:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 4976151 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 72C3ABEEA6 for ; Thu, 25 Sep 2014 16:31:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4425D20274 for ; Thu, 25 Sep 2014 16:31:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07F5A20270 for ; Thu, 25 Sep 2014 16:31:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753930AbaIYQ3W (ORCPT ); Thu, 25 Sep 2014 12:29:22 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:51791 "EHLO baptiste.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752604AbaIYQ2z (ORCPT ); Thu, 25 Sep 2014 12:28:55 -0400 Received: from ayla.of.borg ([84.193.84.167]) by baptiste.telenet-ops.be with bizsmtp id vUUn1o01U3cczKo01UUoq4; Thu, 25 Sep 2014 18:28:53 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.76) (envelope-from ) id 1XXBuR-0003Y0-HF; Thu, 25 Sep 2014 18:28:47 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1XXBuS-0005wz-5X; Thu, 25 Sep 2014 18:28:48 +0200 From: Geert Uytterhoeven To: "Rafael J. Wysocki" , Simon Horman , Magnus Damm Cc: Ulf Hansson , Tomasz Figa , Philipp Zabel , Grygorii Strashko , Kevin Hilman , linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 07/13] ARM: shmobile: R-Mobile: Use generic_pm_domain.attach_dev() for pm_clk setup Date: Thu, 25 Sep 2014 18:28:34 +0200 Message-Id: <1411662520-22795-8-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411662520-22795-1-git-send-email-geert+renesas@glider.be> References: <1411662520-22795-1-git-send-email-geert+renesas@glider.be> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.6 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 Use the just introduced genpd attach/detach callbacks to register the devices' module clocks, instead of doing it directly, to make it DT-proof. Signed-off-by: Geert Uytterhoeven Reviewed-by: Ulf Hansson --- v3: - Update for callback signature changes, v2: - New arch/arm/mach-shmobile/pm-rmobile.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c index 717e6413d29cb998..ae846dfcd69293f7 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.c +++ b/arch/arm/mach-shmobile/pm-rmobile.c @@ -101,6 +101,17 @@ static bool rmobile_pd_active_wakeup(struct device *dev) return true; } +static void rmobile_pd_attach_dev(struct device *dev) +{ + if (pm_clk_no_clocks(dev)) + pm_clk_add(dev, NULL); +} + +static void rmobile_pd_detach_dev(struct device *dev) +{ + pm_clk_remove(dev, NULL); +} + static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) { struct generic_pm_domain *genpd = &rmobile_pd->genpd; @@ -112,6 +123,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup; genpd->power_off = rmobile_pd_power_down; genpd->power_on = rmobile_pd_power_up; + genpd->attach_dev = rmobile_pd_attach_dev; + genpd->detach_dev = rmobile_pd_detach_dev; __rmobile_pd_power_up(rmobile_pd, false); } @@ -130,8 +143,6 @@ void rmobile_add_device_to_domain_td(const char *domain_name, struct device *dev = &pdev->dev; __pm_genpd_name_add_device(domain_name, dev, td); - if (pm_clk_no_clocks(dev)) - pm_clk_add(dev, NULL); } void rmobile_add_devices_to_domains(struct pm_domain_device data[],