diff options
| author | Kevin Hilman | 2016-04-14 14:51:51 -0700 |
|---|---|---|
| committer | Kevin Hilman | 2016-04-14 14:51:51 -0700 |
| commit | 2193a3fd7bc6ffd607c1a791d05d22a4a2282c57 (patch) | |
| tree | 5adc142c76147384d1f4035ce538bf49e2425e37 | |
| parent | 0b24f7a8d6e0d17bcf24433ce5827841a05b5b46 (diff) | |
| parent | d9c9f3b809d2bb0356f013e88d10730eafab5346 (diff) | |
Merge tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek into fixes
- fix boot error reverting commit cc8ed76938b5
("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"
| -rw-r--r-- | drivers/soc/mediatek/mtk-scpsys.c | 11 |
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); } /* |