Skip to contentSkip to conversation

soc: ti: omap-prm: Do not check rstst bit on deassert if already deasserted

PATCH New Tony Lindgren 1 participant 1 message Nov 10, 2020 TI Keystone multicore navigator drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: ti: omap-prm: Do not check rstst bit on deassert if already deasserted

If a rstctrl reset bit is already deasserted, we can just bail out early not wait for rstst to clear. Otherwise we can have deassert fail for already deasserted resets.

Fixes c5117a78dd88 ("soc: ti: omap-prm: poll for reset complete during de-assert")

---

I found this with the genpd conversion, probably can wait for the merge window and be merged together with the other pending omap_prm.c changes I have posted.

---
 drivers/soc/ti/omap_prm.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/soc/ti/omap_prm.c +4 -0
@@ -484,6 +484,10 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev,
 	struct ti_prm_platform_data *pdata = dev_get_platdata(reset->dev);
 	int ret = 0;
 
+	/* Nothing to do if the reset is already deasserted */
+	if (!omap_reset_status(rcdev, id))
+		return 0;
+
 	has_rstst = reset->prm->data->rstst ||
 		(reset->prm->data->flags & OMAP_PRM_HAS_RSTST);
 
Signature · 1 line
2.29.2