soc: mediatek: pm-domains: Add default power off flag

For some power domain, like conn on MT8192, it should be default OFF.
Because the power on/off control relies the function of connectivity chip
and its firmware. And if project choose other chip vendor solution,
those necessary connectivity functions will not provided.

Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Link: https://lore.kernel.org/r/20201030113622.201188-16-enric.balletbo@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c
index 8703d50cd2b73d59fd3c4e1daeee4d032220849f..c3b85b69f2f790f21626eafa81e4a7d3afea4f32 100644 (file)
--- a/drivers/soc/mediatek/mtk-pm-domains.c
+++ b/drivers/soc/mediatek/mtk-pm-domains.c
@@ -377,10 +377,16 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
         * software.  The unused domains will be switched off during
         * late_init time.
         */
-       ret = scpsys_power_on(&pd->genpd);
-       if (ret < 0) {
-               dev_err(scpsys->dev, "%pOF: failed to power on domain: %d\n", node, ret);
-               goto err_unprepare_clocks;
+       if (MTK_SCPD_CAPS(pd, MTK_SCPD_KEEP_DEFAULT_OFF)) {
+               if (scpsys_domain_is_on(pd))
+                       dev_warn(scpsys->dev,
+                                "%pOF: A default off power domain has been ON\n", node);
+       } else {
+               ret = scpsys_power_on(&pd->genpd);
+               if (ret < 0) {
+                       dev_err(scpsys->dev, "%pOF: failed to power on domain: %d\n", node, ret);
+                       goto err_unprepare_clocks;
+               }
        }
 
        if (scpsys->domains[id]) {
@@ -394,7 +400,11 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
        pd->genpd.power_off = scpsys_power_off;
        pd->genpd.power_on = scpsys_power_on;
 
-       pm_genpd_init(&pd->genpd, NULL, false);
+       if (MTK_SCPD_CAPS(pd, MTK_SCPD_KEEP_DEFAULT_OFF))
+               pm_genpd_init(&pd->genpd, NULL, true);
+       else
+               pm_genpd_init(&pd->genpd, NULL, false);
+
        scpsys->domains[id] = &pd->genpd;
 
        return scpsys->pd_data.domains[id];
@@ -467,6 +477,9 @@ static void scpsys_remove_one_domain(struct scpsys_domain *pd)
 {
        int ret;
 
+       if (scpsys_domain_is_on(pd))
+               scpsys_power_off(&pd->genpd);
+
        /*
         * We're in the error cleanup already, so we only complain,
         * but won't emit another error on top of the original one.
@@ -477,8 +490,6 @@ static void scpsys_remove_one_domain(struct scpsys_domain *pd)
                        "failed to remove domain '%s' : %d - state may be inconsistent\n",
                        pd->genpd.name, ret);
 
-       scpsys_power_off(&pd->genpd);
-
        clk_bulk_unprepare(pd->num_clks, pd->clks);
        clk_bulk_put(pd->num_clks, pd->clks);
 

diff --git a/drivers/soc/mediatek/mtk-pm-domains.h b/drivers/soc/mediatek/mtk-pm-domains.h
index 2c745f11b422f01567ca03f22e6cddee8739dea1..a2f4d8f97e058e424171417fd2e897515ed354fd 100644 (file)
--- a/drivers/soc/mediatek/mtk-pm-domains.h
+++ b/drivers/soc/mediatek/mtk-pm-domains.h
@@ -6,6 +6,7 @@
 #define MTK_SCPD_ACTIVE_WAKEUP         BIT(0)
 #define MTK_SCPD_FWAIT_SRAM            BIT(1)
 #define MTK_SCPD_SRAM_ISO              BIT(2)
+#define MTK_SCPD_KEEP_DEFAULT_OFF      BIT(3)
 #define MTK_SCPD_CAPS(_scpd, _x)       ((_scpd)->data->caps & (_x))
 
 #define SPM_VDE_PWR_CON                        0x0210