Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2193a3fd authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

- fix boot error reverting commit cc8ed769
("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"
parents 0b24f7a8 d9c9f3b8

drivers/soc/mediatek/mtk-scpsys.c

+6 −5
Original line number Diff line number Diff line
@@ -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);



		pm_genpd_init(genpd, NULL, true);

		pm_genpd_init(genpd, NULL, false);

	}



	/*