nvmem: qfprom: Fix up qfprom_disable_fuse_blowing() ordering

[ Upstream commit 11c4b3e264d68ba6dcd52d12dbcfd3f564f2f137 ]

qfprom_disable_fuse_blowing() disables a bunch of resources,
and then does a few register writes in the 'conf' address
space.
It works perhaps because the resources are needed only for the
'raw' register space writes, and that the 'conf' space allows
read/writes regardless.
However that makes the code look confusing, so just move the
register writes before turning off the resources in the
function.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210806085947.22682-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index 955b8b8c8238690ad3ee471043e6e3d57a10cc42..8ef772ccfb3674fb6a7ade74861da30d703b4367 100644 (file)
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -104,6 +104,9 @@ static void qfprom_disable_fuse_blowing(const struct qfprom_priv *priv,
 {
        int ret;
 
+       writel(old->timer_val, priv->qfpconf + QFPROM_BLOW_TIMER_OFFSET);
+       writel(old->accel_val, priv->qfpconf + QFPROM_ACCEL_OFFSET);
+
        /*
         * This may be a shared rail and may be able to run at a lower rate
         * when we're not blowing fuses.  At the moment, the regulator framework
@@ -124,9 +127,6 @@ static void qfprom_disable_fuse_blowing(const struct qfprom_priv *priv,
                         "Failed to set clock rate for disable (ignoring)\n");
 
        clk_disable_unprepare(priv->secclk);
-
-       writel(old->timer_val, priv->qfpconf + QFPROM_BLOW_TIMER_OFFSET);
-       writel(old->accel_val, priv->qfpconf + QFPROM_ACCEL_OFFSET);
 }
 
 /**