summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2019-12-12 08:20:10 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-12 12:21:27 +0100
commit6a64fb7d278ffc4baf4f93b61cec1b6cd59512ae (patch)
tree78192eb07993dad1bcb18ca407b3a31be525f9c4 /drivers/bus
parentd05d4ad89d8e0c2d737c1e88ab9dfc51d2d1ebee (diff)
downloadlinux-stable-6a64fb7d278ffc4baf4f93b61cec1b6cd59512ae.tar.gz
linux-stable-6a64fb7d278ffc4baf4f93b61cec1b6cd59512ae.tar.bz2
linux-stable-6a64fb7d278ffc4baf4f93b61cec1b6cd59512ae.zip
bus: ti-sysc: Fix missing reset delay handling
[ Upstream commit e709ed70d122e94cb426b1e1f905829eae19a009 ] We have dts property for "ti,sysc-delay-us", and we're using it, but the wait after OCP softreset only happens if devices are probed in legacy mode. Let's add a delay after writing the OCP softreset when specified. Fixes: e0db94fe87da ("bus: ti-sysc: Make OCP reset work for sysstatus and sysconfig reset bits") Cc: Keerthy <j-keerthy@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/ti-sysc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 2b6670daf7fc..34bd9bf4e68a 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1594,6 +1594,10 @@ static int sysc_reset(struct sysc *ddata)
sysc_val |= sysc_mask;
sysc_write(ddata, sysc_offset, sysc_val);
+ if (ddata->cfg.srst_udelay)
+ usleep_range(ddata->cfg.srst_udelay,
+ ddata->cfg.srst_udelay * 2);
+
if (ddata->clk_enable_quirk)
ddata->clk_enable_quirk(ddata);