lkml.org 
[lkml]   [2021]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 100/152] pinctrl: rockchip: fix restore error in resume
    Date
    From: Wang Panzhenzhuan <randy.wang@rock-chips.com>

    commit c971af25cda94afe71617790826a86253e88eab0 upstream.

    The restore in resume should match to suspend which only set for RK3288
    SoCs pinctrl.

    Fixes: 8dca933127024 ("pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume")
    Reviewed-by: Jianqun Xu <jay.xu@rock-chips.com>
    Reviewed-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
    Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
    Link: https://lore.kernel.org/r/20210223100725.269240-1-jay.xu@rock-chips.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pinctrl/pinctrl-rockchip.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    --- a/drivers/pinctrl/pinctrl-rockchip.c
    +++ b/drivers/pinctrl/pinctrl-rockchip.c
    @@ -3727,12 +3727,15 @@ static int __maybe_unused rockchip_pinct
    static int __maybe_unused rockchip_pinctrl_resume(struct device *dev)
    {
    struct rockchip_pinctrl *info = dev_get_drvdata(dev);
    - int ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,
    - rk3288_grf_gpio6c_iomux |
    - GPIO6C6_SEL_WRITE_ENABLE);
    + int ret;

    - if (ret)
    - return ret;
    + if (info->ctrl->type == RK3288) {
    + ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,
    + rk3288_grf_gpio6c_iomux |
    + GPIO6C6_SEL_WRITE_ENABLE);
    + if (ret)
    + return ret;
    + }

    return pinctrl_force_default(info->pctl_dev);
    }

    \
     
     \ /
      Last update: 2021-04-05 11:41    [W:7.632 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site