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

Commit fb1f1c90 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: subsys-pil-tz: Enable/disable proxy regulators in shutdown path"

parents 7176e2e7 a5008c93
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -464,19 +464,26 @@ static int pil_shutdown_trusted(struct pil_desc *pil)
	struct pil_tz_data *d = desc_to_data(pil);
	int rc;

	rc = enable_regulators(pil->dev, d->proxy_regs, d->proxy_reg_count);
	if (rc)
		return rc;

	rc = prepare_enable_clocks(pil->dev, d->proxy_clks,
						d->proxy_clk_count);
	if (rc)
		return rc;
		goto err_clks;

	rc = pas_shutdown(d->pas_id);

	disable_unprepare_clocks(d->proxy_clks, d->proxy_clk_count);

	disable_unprepare_clocks(d->clks, d->clk_count);

	disable_regulators(d->proxy_regs, d->proxy_reg_count);
	disable_regulators(d->regs, d->reg_count);

	return rc;
err_clks:
	disable_regulators(d->proxy_regs, d->proxy_reg_count);
	return rc;
}