UPSTREAM: soc: rockchip: power-domain: add support for sub-power domains

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.

Change-Id: Ie2a79aab6e1e073157c06d44252ef327caee5261
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
[restructured error handling in subdomain-addition]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 v4.7-armsoc/drivers commit 6be05b5ec16132f3df3f1d857ab01e30f726b542)

diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index ddee406a2fe4ef9bf1b174de1daa9a87c8654590..cf447e3b7b23fc0924f68669ef6686019b522ff3 100644 (file)
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -371,6 +371,61 @@ 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;
+
+               error = of_property_read_u32(parent, "reg", &idx);
+               if (error) {
+                       dev_err(pmu->dev,
+                               "%s: failed to retrieve domain id (reg): %d\n",
+                               parent->name, error);
+                       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;
+               }
+
+               error = of_property_read_u32(np, "reg", &idx);
+               if (error) {
+                       dev_err(pmu->dev,
+                               "%s: failed to retrieve domain id (reg): %d\n",
+                               np->name, error);
+                       goto err_out;
+               }
+               child_domain = pmu->genpd_data.domains[idx];
+
+               error = pm_genpd_add_subdomain(parent_domain, child_domain);
+               if (error) {
+                       dev_err(pmu->dev, "%s failed to add subdomain %s: %d\n",
+                               parent_domain->name, child_domain->name, error);
+                       goto err_out;
+               } else {
+                       dev_dbg(pmu->dev, "%s add subdomain: %s\n",
+                               parent_domain->name, child_domain->name);
+               }
+
+               rockchip_pm_add_subdomain(pmu, np);
+       }
+
+       return 0;
+
+err_out:
+       of_node_put(np);
+       return error;
+}
+
 static int rockchip_pm_domain_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -436,6 +491,14 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)
                                node->name, error);
                        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);
+                       of_node_put(node);
+                       goto err_out;
+               }
        }
 
        if (error) {