summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2019-07-22 12:44:52 +0200
committerTony Lindgren <tony@atomide.com>2019-07-24 09:50:01 +0200
commite212abd452a4af3174fcd469d46656f83e135a19 (patch)
tree63622c17033e4ad464c49a222aab6584a255d0aa /drivers/bus
parentbus: ti-sysc: Fix handling of forced idle (diff)
downloadlinux-e212abd452a4af3174fcd469d46656f83e135a19.tar.xz
linux-e212abd452a4af3174fcd469d46656f83e135a19.zip
bus: ti-sysc: Fix using configured sysc mask value
We have cases where there are no softreset bits like with am335x lcdc. In that case ti,sysc-mask = <0> needs to be handled properly. Tested-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/ti-sysc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 78fb52e1582e..4963c7733554 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1692,10 +1692,7 @@ static int sysc_init_sysc_mask(struct sysc *ddata)
if (error)
return 0;
- if (val)
- ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;
- else
- ddata->cfg.sysc_val = ddata->cap->sysc_mask;
+ ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;
return 0;
}