]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
remoteproc: st: explicitly request exclusive reset control
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 19 Jul 2017 15:26:17 +0000 (17:26 +0200)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 28 Aug 2017 06:18:52 +0000 (23:18 -0700)
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. Convert all drivers requesting exclusive resets to the
explicit API call so the temporary transition helpers can be removed.

No functional changes.

Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: linux-remoteproc@vger.kernel.org
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
drivers/remoteproc/st_remoteproc.c

index d534bf23dc560516151d213414fb07b6dae229f1..aacef0ea3b902c62984ff468b214eae607906431 100644 (file)
@@ -212,7 +212,8 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
        int err;
 
        if (ddata->config->sw_reset) {
-               ddata->sw_reset = devm_reset_control_get(dev, "sw_reset");
+               ddata->sw_reset = devm_reset_control_get_exclusive(dev,
+                                                                  "sw_reset");
                if (IS_ERR(ddata->sw_reset)) {
                        dev_err(dev, "Failed to get S/W Reset\n");
                        return PTR_ERR(ddata->sw_reset);
@@ -220,7 +221,8 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
        }
 
        if (ddata->config->pwr_reset) {
-               ddata->pwr_reset = devm_reset_control_get(dev, "pwr_reset");
+               ddata->pwr_reset = devm_reset_control_get_exclusive(dev,
+                                                                   "pwr_reset");
                if (IS_ERR(ddata->pwr_reset)) {
                        dev_err(dev, "Failed to get Power Reset\n");
                        return PTR_ERR(ddata->pwr_reset);