From: Tony Lindgren Date: Sun, 22 Nov 2020 03:22:00 +0000 (-0800) Subject: soc: ti: omap-prm: Do not check rstst bit on deassert if already deasserted X-Git-Tag: v5.11-rc1~90^2~9^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd79aebe5f7cc0bdc9656ddf1a52f04da9480cd7;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Santosh Shilimkar --- diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c index 980b04c38fd94..4d41dc3cdce1f 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);