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

Commit b6036314 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

bus: ti-sysc: re-order the clkdm control around reset handling 



Parenting clockdomain for the IP should be enabled during the reset
handling logic, otherwise the reset may not finish properly. Re-order
the clockdomain control logic to avoid this.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b58056da

drivers/bus/ti-sysc.c

+5 −4
Original line number Diff line number Diff line
@@ -1090,11 +1090,11 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev) 
	ddata->enabled = false;



err_allow_idle:

	sysc_clkdm_allow_idle(ddata);



	if (ddata->disable_on_idle)

		reset_control_assert(ddata->rsts);



	sysc_clkdm_allow_idle(ddata);



	return error;

}
@@ -1108,11 +1108,12 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) 
	if (ddata->enabled)

		return 0;



	if (ddata->disable_on_idle)

		reset_control_deassert(ddata->rsts);



	sysc_clkdm_deny_idle(ddata);



	if (ddata->disable_on_idle)

		reset_control_deassert(ddata->rsts);



	if (sysc_opt_clks_needed(ddata)) {

		error = sysc_enable_opt_clocks(ddata);

		if (error)