From patchwork Mon Dec 12 15:46:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 5605 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E0AB323E01 for ; Mon, 12 Dec 2011 15:45:20 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id D4674A1854F for ; Mon, 12 Dec 2011 15:45:20 +0000 (UTC) Received: by eaa13 with SMTP id 13so780284eaa.11 for ; Mon, 12 Dec 2011 07:45:20 -0800 (PST) Received: by 10.205.129.137 with SMTP id hi9mr2090080bkc.90.1323704720623; Mon, 12 Dec 2011 07:45:20 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs51040bkc; Mon, 12 Dec 2011 07:45:20 -0800 (PST) Received: by 10.236.123.52 with SMTP id u40mr26242373yhh.126.1323704718641; Mon, 12 Dec 2011 07:45:18 -0800 (PST) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by mx.google.com with ESMTP id f21si4175980ani.108.2011.12.12.07.45.18; Mon, 12 Dec 2011 07:45:18 -0800 (PST) Received-SPF: neutral (google.com: 203.254.224.34 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.34; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.34 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm1.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LW300DOKL3BID30@mailout4.samsung.com> for patches@linaro.org; Tue, 13 Dec 2011 00:45:17 +0900 (KST) X-AuditID: cbfee61a-b7b89ae000001a15-e7-4ee6218c5db8 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id 4C.82.06677.C8126EE4; Tue, 13 Dec 2011 00:45:17 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTPA id <0LW300JBXL35FY00@mmp2.samsung.com> for patches@linaro.org; Tue, 13 Dec 2011 00:45:16 +0900 (KST) From: Thomas Abraham To: linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org Cc: rjw@sisk.pl, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, rob.herring@calxeda.com, grant.likely@secretlab.ca, kgene.kim@samsung.com, broonie@opensource.wolfsonmicro.com, patches@linaro.org Subject: [PATCH 1/2] PM / Domains: Add OF support Date: Mon, 12 Dec 2011 21:16:28 +0530 Message-id: <1323704789-23923-2-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1323704789-23923-1-git-send-email-thomas.abraham@linaro.org> References: <1323704789-23923-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== A device node pointer is added to generic pm domain structure to associate the domain with a node in the device tree. The platform code parses the device tree to find available nodes representing the generic power domain, instantiates the available domains and initializes them by calling pm_genpd_init(). Nodes representing the devices include a phandle of the power domain to which it belongs. As these devices get instantiated, the driver code checkes for availability of a power domain phandle, converts the phandle to a device node and uses the new pm_genpd_of_add_device() api to associate the device with a power domain. pm_genpd_of_add_device() runs through its list of registered power domains and matches the OF node of the domain with the one specified as the parameter. If a match is found, the device is associated with the matched domain. Cc: Rafael J. Wysocki Cc: Rob Herring Cc: Grant Likely Signed-off-by: Thomas Abraham --- drivers/base/power/domain.c | 14 +++++++++++++- include/linux/pm_domain.h | 13 +++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 92e6a90..e895dc9 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1118,14 +1118,26 @@ static void pm_genpd_complete(struct device *dev) * @td: Set of PM QoS timing parameters to attach to the device. */ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, - struct gpd_timing_data *td) + struct gpd_timing_data *td, struct device_node *node) { struct generic_pm_domain_data *gpd_data; + struct generic_pm_domain *gpd = NULL; struct pm_domain_data *pdd; int ret = 0; dev_dbg(dev, "%s()\n", __func__); + mutex_lock(&gpd_list_lock); + if (node) { + list_for_each_entry(gpd, &gpd_list, gpd_list_node) { + if (gpd->of_node == node) { + genpd = gpd; + break; + } + } + } + mutex_unlock(&gpd_list_lock); + if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) return -EINVAL; diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index a03a0ad..2ce7cc4 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -11,6 +11,7 @@ #include #include +#include enum gpd_status { GPD_STATE_ACTIVE = 0, /* PM domain is active */ @@ -70,6 +71,7 @@ struct generic_pm_domain { s64 break_even_ns; /* Power break even for the entire domain. */ s64 max_off_time_ns; /* Maximum allowed "suspended" time. */ ktime_t power_off_time; + struct device_node *of_node; /* Node in device tree */ }; static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd) @@ -115,12 +117,19 @@ extern struct dev_power_governor simple_qos_governor; extern struct generic_pm_domain *dev_to_genpd(struct device *dev); extern int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, - struct gpd_timing_data *td); + struct gpd_timing_data *td, + struct device_node *gpd_node); static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) { - return __pm_genpd_add_device(genpd, dev, NULL); + return __pm_genpd_add_device(genpd, dev, NULL, NULL); +} + +static inline int pm_genpd_of_add_device(struct device_node *gpd_node, + struct device *dev) +{ + return __pm_genpd_add_device(NULL, dev, NULL, gpd_node); } extern int pm_genpd_remove_device(struct generic_pm_domain *genpd,