mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 08:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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"
This commit is contained in:
Kevin Hilman
2016-04-14 14:51:51 -07:00
parent 0b24f7a8d6 d9c9f3b809
commit 2193a3fd7b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/soc/mediatek/mtk-scpsys.c
View File

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