lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 110/219] nvmem: qfprom: Fix up qfprom_disable_fuse_blowing() ordering
    Date
    From: Rajendra Nayak <rnayak@codeaurora.org>

    [ 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>
    ---
    drivers/nvmem/qfprom.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
    index d6d3f24685a8..f372eda2b255 100644
    --- a/drivers/nvmem/qfprom.c
    +++ b/drivers/nvmem/qfprom.c
    @@ -138,6 +138,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
    @@ -158,9 +161,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);
    }

    /**
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 14:37    [W:4.116 / U:2.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site