- fix boot error reverting commit cc8ed76938

("soc: mediatek: SCPSYS: Fix double enabling of regulators")
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJXDhrNAAoJELQ5Ylss8dNDKKIP/1gED6339YiN++6FceIQK8+n
 52ShupCN+laNRRD39oTvMNQUva8JX3UUZhra6VrvMjto/WSByR95iKx3Pg+Otvnk
 ufIYCzQFbaPBAYXM0PsEN0ZclTAahsYojfqdLji+HXTncF+yPVy6MMaVFBSKZSt0
 3xLu7qyqbE2HPGq6+L7Z4ZknP6BybXn/1rfLh/yMrddPfeKVXjLoFGuNhvnOobhG
 blC8baaN2qq4vKyuPAoNlpo+un4mav82w6os/ItHARK/f6bmTbUsNHEdqglST7iM
 wl3FwuZmrJ81yOJV51Xw7m52FNzuezOa0IfhRzfxa+mRG6Ea1q4tdvGuwk2XQCOT
 dwDoxB9zL0Cx4NstOxZAJjywVYop0tDZA2I5fLG7otB0EFJiPI1KxWKqEln78ClU
 f/lyGxgP1+NQ21TOzF8lzKyYH/q7agh1ZGEsehfQUM3HLLOdWSKfKOz1BZxe7XBh
 HPmimoAr5CoyhfgqzTjZL3qUlCTQ4pJ0PNffGTNVACr7xkDIzmGWSPL/EdG8KPDx
 Hj2UCogKYB0EcUfmLfYZHjLh8u7y+sd1LRV6GG65z0LYkpwryn84ZpeiOMr3cGqk
 iJ+F8+ZmQDTkiWDwMVIfikgKfugIJMZd/5RnA04Sa/EimGBJaeNT8wSLhHs2M5vl
 kJ/oeEy47iutdIzg9XDl
 =wAo+
 -----END PGP SIGNATURE-----

Merge tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek into fixes

- fix boot error reverting commit cc8ed76938
("soc: mediatek: SCPSYS: Fix double enabling of regulators")

* tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek:
  Revert "soc: mediatek: SCPSYS: Fix double enabling of regulators"

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);
 	}
 
 	/*