1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
index 57e781c71e67..837effe19907 100644
--- a/drivers/soc/mediatek/mtk-scpsys.c
+++ b/drivers/soc/mediatek/mtk-scpsys.c
@@ -491,13 +491,14 @@ static int scpsys_probe(struct platform_device *pdev)
                 genpd->dev_ops.active_wakeup = scpsys_active_wakeup;
 
                 /*
-                 * With CONFIG_PM disabled turn on all domains to make the
-                 * hardware usable.
+                 * Initially turn on all domains to make the domains usable
+                 * with !CONFIG_PM and to get the hardware in sync with the
+                 * software.  The unused domains will be switched off during
+                 * late_init time.
                  */
-                if (!IS_ENABLED(CONFIG_PM))
-                        genpd->power_on(genpd);
+                genpd->power_on(genpd);
 
-                pm_genpd_init(genpd, NULL, true);
+                pm_genpd_init(genpd, NULL, false);
         }
 
         /*