mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 20:14:06 +02:00
pmdomain providers:
- tegra: Ensure pmc power-domains are in a known state -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmie6iQXHHVsZi5oYW5z c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCk4MBAAg1rfgy2Ui3kP3kWVeOA3gf/k eTfxEYuZhJaDG5Q/WWrREQR3q3V+rLdaBxyWjdGAkT9a8LnnJV21TUsDII/Segfz 4HcJA5txV2LcOtiZVg0S4J/aKA4klhPji/H8vN3yEq5xS2ldre9oB9z+u8yPuOhm zmtxjrtzNZNkcSim+wE4tfk9XmnEut71Dh2IG8whTrxNnWXJnCbfgRn6jznKGlBm i1Wrwdk05Z4EA4nkAHfeXWqqGcZoGhlFnFCYqKG0wymTBX0MPbT1dP1plwaKME0I 8ZQT+41Tm0BBs0T6PtWm238RmHqTGw2kP2QWXZvlbh3BMXDdoEqAvrwEuIOzOoPC +lmCRhU8kHeDrI9wuMAntiuqAF2Mjq2UJs2qfyLsS2if9Di773i7U4tC9m1b+G2A cvTj9A3X7/xlKFw4L8eF1xZU8vJ+A8woPpNPyUTgrK2NXdKU5MZdHIXfGyFCtEuQ 60z0iaYZt/7sksc3RfeCus4p72eFfpqK1ryHG75FhkQ/oNpxVk7VSfq9eEtnJ4H8 K5uVjxYkS4rd2/dPmMCW0CtnHvZNXrCc/0hMnpos8qQ8rftrvEVlt4+jQLupxLTd L7fa9ZIxzJSBNGqQY7uuJBeC44Z2UyuOBz+qbzGTocS6If5ggd1yj+Vs4JuSEFrO UXFG98C0+iJN5GQ1lgI= =cH2o -----END PGP SIGNATURE----- Merge tag 'pmdomain-v6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm Pull pmdomain fix from Ulf Hansson: - tegra: Ensure pmc power-domains are in a known state * tag 'pmdomain-v6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: soc/tegra: pmc: Ensure power-domains are in a known state
This commit is contained in:
commit
66ba63d4d8
|
|
@ -1232,7 +1232,7 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg,
|
|||
}
|
||||
|
||||
static int tegra_powergate_of_get_resets(struct tegra_powergate *pg,
|
||||
struct device_node *np, bool off)
|
||||
struct device_node *np)
|
||||
{
|
||||
struct device *dev = pg->pmc->dev;
|
||||
int err;
|
||||
|
|
@ -1247,22 +1247,6 @@ static int tegra_powergate_of_get_resets(struct tegra_powergate *pg,
|
|||
err = reset_control_acquire(pg->reset);
|
||||
if (err < 0) {
|
||||
pr_err("failed to acquire resets: %d\n", err);
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (off) {
|
||||
err = reset_control_assert(pg->reset);
|
||||
} else {
|
||||
err = reset_control_deassert(pg->reset);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
||||
reset_control_release(pg->reset);
|
||||
}
|
||||
|
||||
out:
|
||||
if (err) {
|
||||
reset_control_release(pg->reset);
|
||||
reset_control_put(pg->reset);
|
||||
}
|
||||
|
||||
|
|
@ -1308,20 +1292,43 @@ static int tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
|
|||
goto set_available;
|
||||
}
|
||||
|
||||
err = tegra_powergate_of_get_resets(pg, np, off);
|
||||
err = tegra_powergate_of_get_resets(pg, np);
|
||||
if (err < 0) {
|
||||
dev_err(dev, "failed to get resets for %pOFn: %d\n", np, err);
|
||||
goto remove_clks;
|
||||
}
|
||||
|
||||
if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS)) {
|
||||
if (off)
|
||||
WARN_ON(tegra_powergate_power_up(pg, true));
|
||||
/*
|
||||
* If the power-domain is off, then ensure the resets are asserted.
|
||||
* If the power-domain is on, then power down to ensure that when is
|
||||
* it turned on the power-domain, clocks and resets are all in the
|
||||
* expected state.
|
||||
*/
|
||||
if (off) {
|
||||
err = reset_control_assert(pg->reset);
|
||||
if (err) {
|
||||
pr_err("failed to assert resets: %d\n", err);
|
||||
goto remove_resets;
|
||||
}
|
||||
} else {
|
||||
err = tegra_powergate_power_down(pg);
|
||||
if (err) {
|
||||
dev_err(dev, "failed to turn off PM domain %s: %d\n",
|
||||
pg->genpd.name, err);
|
||||
goto remove_resets;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* If PM_GENERIC_DOMAINS is not enabled, power-on
|
||||
* the domain and skip the genpd registration.
|
||||
*/
|
||||
if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS)) {
|
||||
WARN_ON(tegra_powergate_power_up(pg, true));
|
||||
goto remove_resets;
|
||||
}
|
||||
|
||||
err = pm_genpd_init(&pg->genpd, NULL, off);
|
||||
err = pm_genpd_init(&pg->genpd, NULL, true);
|
||||
if (err < 0) {
|
||||
dev_err(dev, "failed to initialise PM domain %pOFn: %d\n", np,
|
||||
err);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user