diff options
| author | Tero Kristo <t-kristo@ti.com> | 2019-08-07 15:46:05 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 04:32:15 -0700 |
| commit | bb88b86c1f623e079968c6b8799989019c5f8413 (patch) | |
| tree | 497649525cb42db2d49f8deb636c2a323d981a3f /drivers/bus | |
| parent | 4345f0dc015da045a775655e6afac66dbaa1f62d (diff) | |
| download | linux-bb88b86c1f623e079968c6b8799989019c5f8413.tar.gz linux-bb88b86c1f623e079968c6b8799989019c5f8413.tar.bz2 linux-bb88b86c1f623e079968c6b8799989019c5f8413.zip | |
bus: ti-sysc: allow reset sharing across devices
Some devices need to share their reset signals, like DSP MMUs, thus drop
the exclusive notation from reset request. Also, balance the init time
reset count, otherwise the resets will never be applied post boot.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 6d34ccb914e0..ffe62a0002b2 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -501,7 +501,7 @@ static void sysc_clkdm_allow_idle(struct sysc *ddata) static int sysc_init_resets(struct sysc *ddata) { ddata->rsts = - devm_reset_control_get_optional(ddata->dev, "rstctrl"); + devm_reset_control_get_optional_shared(ddata->dev, "rstctrl"); if (IS_ERR(ddata->rsts)) return PTR_ERR(ddata->rsts); @@ -1527,7 +1527,7 @@ static int sysc_legacy_init(struct sysc *ddata) */ static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset) { - int error, val; + int error; if (!ddata->rsts) return 0; @@ -1538,7 +1538,9 @@ static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset) return error; } - return reset_control_deassert(ddata->rsts); + reset_control_deassert(ddata->rsts); + + return 0; } /* @@ -2415,6 +2417,10 @@ static int sysc_probe(struct platform_device *pdev) goto unprepare; } + /* Balance reset counts */ + if (ddata->rsts) + reset_control_assert(ddata->rsts); + sysc_show_registers(ddata); ddata->dev->type = &sysc_device_type; |