Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932579AbcCCIIg (ORCPT ); Thu, 3 Mar 2016 03:08:36 -0500 Received: from regular1.263xmail.com ([211.150.99.139]:60588 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757198AbcCCIId (ORCPT ); Thu, 3 Mar 2016 03:08:33 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: zhangqing@rock-chips.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: zhangqing@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Elaine Zhang To: heiko@sntech.de, khilman@baylibre.com, wxt@rock-chips.com Cc: linux-arm-kernel@lists.infradead.org, huangtao@rock-chips.com, zyw@rock-chips.com, xxx@rock-chips.com, jay.xu@rock-chips.com, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Elaine Zhang Subject: [PATCH v5 3/6] rockchip: power-domain: add support for sub-power domains Date: Thu, 3 Mar 2016 16:03:50 +0800 Message-Id: <1456992233-25164-4-git-send-email-zhangqing@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456992233-25164-1-git-send-email-zhangqing@rock-chips.com> References: <1456992233-25164-1-git-send-email-zhangqing@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2597 Lines: 94 This patch adds support for making one power domain a sub-domain of other domain. This is useful for modeling power dependences, which needs to have more than one power domain enabled to be operational. Signed-off-by: Elaine Zhang --- drivers/soc/rockchip/pm_domains.c | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 0465a06..1777e8e 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -370,6 +370,63 @@ static void rockchip_configure_pd_cnt(struct rockchip_pmu *pmu, regmap_write(pmu->regmap, domain_reg_offset + 4, count); } +static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu, + struct device_node *parent) +{ + struct device_node *np; + struct generic_pm_domain *child_domain, *parent_domain; + int error; + + for_each_child_of_node(parent, np) { + u32 idx = ~0; + + if (of_property_read_u32(parent, "reg", &idx)) { + dev_err(pmu->dev, + "%s: failed to retrieve domain id (reg)\n", + parent->name); + goto err_out; + } + parent_domain = pmu->genpd_data.domains[idx]; + + error = rockchip_pm_add_one_domain(pmu, np); + if (error) { + dev_err(pmu->dev, "failed to handle node %s: %d\n", + np->name, error); + goto err_out; + } + + if (of_property_read_u32(np, "reg", &idx)) { + dev_err(pmu->dev, + "%s: failed to retrieve domain id (reg)\n", + np->name); + goto err_out; + } + child_domain = pmu->genpd_data.domains[idx]; + + if (pm_genpd_add_subdomain(parent_domain, child_domain)) { + dev_err(pmu->dev, "%s failed to add subdomain: %s\n", + parent_domain->name, child_domain->name); + goto err_out; + } else { + dev_info(pmu->dev, "%s add subdomain: %s\n", + parent_domain->name, child_domain->name); + } + + error = rockchip_pm_add_subdomain(pmu, np); + if (error < 0) + goto rm_sub_domain; + } + return 0; + +err_out: + of_node_put(parent); + of_node_put(np); + return -EINVAL; +rm_sub_domain: + pm_genpd_remove_subdomain(parent_domain, child_domain); + return error; +} + static int rockchip_pm_domain_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -440,6 +497,13 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev) of_node_put(node); goto err_out; } + + error = rockchip_pm_add_subdomain(pmu, node); + if (error < 0) { + dev_err(dev, "failed to handle subdomain node %s: %d\n", + node->name, error); + goto err_out; + } } if (error) { -- 1.9.1