summaryrefslogtreecommitdiff
path: root/drivers/soc/ti
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2020-11-16 12:57:13 +0200
committerTony Lindgren <tony@atomide.com>2020-11-13 09:59:01 +0200
commitc1995e5afaf6abf3922b5395ad1f4096951e3276 (patch)
tree0694119b67eda848d7e45a378f6864097519301e /drivers/soc/ti
parente7ae08d398e094e1305dee823435b1f996d39106 (diff)
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") Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/soc/ti')
-rw-r--r--drivers/soc/ti/omap_prm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c
index 980b04c38fd9..4d41dc3cdce1 100644
--- a/drivers/soc/ti/omap_prm.c
+++ b/drivers/soc/ti/omap_prm.c
@@ -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);