lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 108/361] pinctrl: qcom: spmi-mpp: Fix drive strength setting
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stephen Boyd <swboyd@chromium.org>

    [ Upstream commit 89c68b102f13f123aaef22b292526d6b92501334 ]

    It looks like we parse the drive strength setting here, but never
    actually write it into the hardware to update it. Parse the setting and
    then write it at the end of the pinconf setting function so that it
    actually sticks in the hardware.

    Fixes: 0e948042c420 ("pinctrl: qcom: spmi-mpp: Implement support for sink mode")
    Cc: Doug Anderson <dianders@chromium.org>
    Signed-off-by: Stephen Boyd <swboyd@chromium.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
    +++ b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
    @@ -457,7 +457,7 @@ static int pmic_mpp_config_set(struct pi
    pad->dtest = arg;
    break;
    case PIN_CONFIG_DRIVE_STRENGTH:
    - arg = pad->drive_strength;
    + pad->drive_strength = arg;
    break;
    case PMIC_MPP_CONF_AMUX_ROUTE:
    if (arg >= PMIC_MPP_AMUX_ROUTE_ABUS4)
    @@ -504,6 +504,10 @@ static int pmic_mpp_config_set(struct pi
    if (ret < 0)
    return ret;

    + ret = pmic_mpp_write(state, pad, PMIC_MPP_REG_SINK_CTL, pad->drive_strength);
    + if (ret < 0)
    + return ret;
    +
    val = pad->is_enabled << PMIC_MPP_REG_MASTER_EN_SHIFT;

    return pmic_mpp_write(state, pad, PMIC_MPP_REG_EN_CTL, val);

    \
     
     \ /
      Last update: 2018-11-12 01:08    [W:4.025 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site