soc: imx: gpcv2: add runtime PM support for power-domains

This allows to nest domains into other power domains and have the
parent domain powered up/down as required by the child domains.

Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index c449cd0..800287a 100644 (file)
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -12,6 +12,7 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
+#include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/sizes.h>
@@ -141,11 +142,17 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
        u32 reg_val;
        int ret;
 
+       ret = pm_runtime_get_sync(domain->dev);
+       if (ret < 0) {
+               pm_runtime_put_noidle(domain->dev);
+               return ret;
+       }
+
        if (!IS_ERR(domain->regulator)) {
                ret = regulator_enable(domain->regulator);
                if (ret) {
                        dev_err(domain->dev, "failed to enable regulator\n");
-                       return ret;
+                       goto out_put_pm;
                }
        }
 
@@ -204,6 +211,8 @@ out_clk_disable:
 out_regulator_disable:
        if (!IS_ERR(domain->regulator))
                regulator_disable(domain->regulator);
+out_put_pm:
+       pm_runtime_put(domain->dev);
 
        return ret;
 }
@@ -266,6 +275,8 @@ static int imx_pgc_power_down(struct generic_pm_domain *genpd)
                }
        }
 
+       pm_runtime_put(domain->dev);
+
        return 0;
 
 out_clk_disable:
@@ -523,6 +534,8 @@ static int imx_pgc_domain_probe(struct platform_device *pdev)
                return dev_err_probe(domain->dev, domain->num_clks,
                                     "Failed to get domain's clocks\n");
 
+       pm_runtime_enable(domain->dev);
+
        regmap_update_bits(domain->regmap, GPC_PGC_CPU_MAPPING,
                           domain->bits.map, domain->bits.map);
 
@@ -546,6 +559,7 @@ out_genpd_remove:
 out_domain_unmap:
        regmap_update_bits(domain->regmap, GPC_PGC_CPU_MAPPING,
                           domain->bits.map, 0);
+       pm_runtime_disable(domain->dev);
 
        return ret;
 }
@@ -560,6 +574,8 @@ static int imx_pgc_domain_remove(struct platform_device *pdev)
        regmap_update_bits(domain->regmap, GPC_PGC_CPU_MAPPING,
                           domain->bits.map, 0);
 
+       pm_runtime_disable(domain->dev);
+
        return 0;
 }