From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: Nishanth Menon <nm@ti.com>, Tero Kristo <t-kristo@ti.com>,
Dave Gerlach <d-gerlach@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
devicetree@vger.kernel.org, Faiz Abbas <faiz_abbas@ti.com>,
Keerthy <j-keerthy@ti.com>, Suman Anna <s-anna@ti.com>,
Rob Herring <robh@kernel.org>,
linux-arm-kernel@lists.infradead.org,
Roger Quadros <rogerq@ti.com>
Subject: [PATCH 09/12] bus: ti-sysc: Do rstctrl reset handling in two phases
Date: Mon, 27 May 2019 05:13:45 -0700 [thread overview]
Message-ID: <20190527121348.45251-10-tony@atomide.com> (raw)
In-Reply-To: <20190527121348.45251-1-tony@atomide.com>
We need to deassert rstctrl resets before enabling clocks to avoid clock
"failed to enable" errors. For asserting rstctrl reset, the clocks need
to be enabled.
As the reset controller status is not available for arrays, let's use
devm_reset_control_get_optional() so we can get the status after reset.
Note that depends on a proper PRM rstctrl driver, so far I've only
tested this with earlier reset-simple patches.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/bus/ti-sysc.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -483,7 +483,7 @@ static void sysc_clkdm_allow_idle(struct sysc *ddata)
static int sysc_init_resets(struct sysc *ddata)
{
ddata->rsts =
- devm_reset_control_array_get_optional_exclusive(ddata->dev);
+ devm_reset_control_get_optional(ddata->dev, "rstctrl");
if (IS_ERR(ddata->rsts))
return PTR_ERR(ddata->rsts);
@@ -1407,7 +1407,7 @@ static int sysc_legacy_init(struct sysc *ddata)
*/
static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset)
{
- int error;
+ int error, val;
if (!ddata->rsts)
return 0;
@@ -1418,7 +1418,14 @@ static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset)
return error;
}
- return reset_control_deassert(ddata->rsts);
+ error = reset_control_deassert(ddata->rsts);
+ if (error == -EEXIST)
+ return 0;
+
+ error = readx_poll_timeout(reset_control_status, ddata->rsts, val,
+ val == 0, 100, MAX_MODULE_SOFTRESET_WAIT);
+
+ return error;
}
/*
@@ -1476,12 +1483,8 @@ static int sysc_init_module(struct sysc *ddata)
{
int error = 0;
bool manage_clocks = true;
- bool reset = true;
- if (ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT)
- reset = false;
-
- error = sysc_rstctrl_reset_deassert(ddata, reset);
+ error = sysc_rstctrl_reset_deassert(ddata, false);
if (error)
return error;
@@ -1505,6 +1508,12 @@ static int sysc_init_module(struct sysc *ddata)
goto err_opt_clocks;
}
+ if (!(ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT)) {
+ error = sysc_rstctrl_reset_deassert(ddata, true);
+ if (error)
+ goto err_main_clocks;
+ }
+
ddata->revision = sysc_read_revision(ddata);
sysc_init_revision_quirks(ddata);
--
2.21.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-27 12:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-27 12:13 [PATCH 00/12] ti-sysc driver changes to drop custom hwmods property Tony Lindgren
2019-05-27 12:13 ` [PATCH 01/12] bus: ti-sysc: Support 16-bit writes too Tony Lindgren
2019-05-28 11:06 ` David Laight
2019-05-28 12:27 ` Tony Lindgren
2019-05-27 12:13 ` [PATCH 02/12] bus: ti-sysc: Make OCP reset work for sysstatus and sysconfig reset bits Tony Lindgren
2019-05-27 12:13 ` [PATCH 03/12] bus: ti-sysc: Allow QUIRK_LEGACY_IDLE even if legacy_mode is not set Tony Lindgren
2019-05-27 12:13 ` [PATCH 04/12] bus: ti-sysc: Enable interconnect target module autoidle bit on enable Tony Lindgren
2019-05-27 12:13 ` [PATCH 05/12] bus: ti-sysc: Handle clockactivity for enable and disable Tony Lindgren
2019-05-27 12:13 ` [PATCH 06/12] bus: ti-sysc: Handle swsup idle mode quirks Tony Lindgren
2019-05-27 12:13 ` [PATCH 07/12] bus: ti-sysc: Set ENAWAKEUP if available Tony Lindgren
2019-05-27 12:13 ` [PATCH 08/12] bus: ti-sysc: Add support for disabling module without legacy mode Tony Lindgren
2019-05-27 12:13 ` Tony Lindgren [this message]
2019-05-27 12:13 ` [PATCH 10/12] bus: ti-sysc: Detect uarts also on omap34xx Tony Lindgren
2019-05-27 12:13 ` [PATCH 11/12] ARM: dts: Drop legacy custom hwmods property for omap4 uart Tony Lindgren
2019-05-27 12:13 ` [PATCH 12/12] ARM: dts: Drop legacy custom hwmods property for omap4 mmc Tony Lindgren
2019-05-28 0:58 ` [PATCH 00/12] ti-sysc driver changes to drop custom hwmods property Keerthy
2019-05-28 6:16 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190527121348.45251-10-tony@atomide.com \
--to=tony@atomide.com \
--cc=d-gerlach@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=faiz_abbas@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=j-keerthy@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=peter.ujfalusi@ti.com \
--cc=robh@kernel.org \
--cc=rogerq@ti.com \
--cc=s-anna@ti.com \
--cc=t-kristo@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).