From: "Heiko Stübner" <heiko@sntech.de>
To: linus.walleij@linaro.org, Jianqun Xu <jay.xu@rock-chips.com>
Cc: linux-gpio@vger.kernel.org, Jianqun Xu <jay.xu@rock-chips.com>,
Wang Panzhenzhuan <randy.wang@rock-chips.com>,
linux-rockchip@lists.infradead.org
Subject: Re: [PATCH] pinctrl: rockchip: fix restore error in resume
Date: Tue, 23 Feb 2021 11:13:30 +0100 [thread overview]
Message-ID: <9688540.oDFzTOozpa@diego> (raw)
In-Reply-To: <20210223100725.269240-1-jay.xu@rock-chips.com>
Hi Jianqun,
Please add a version to the subject when sending updated patches.
So this would be :
[PATCH v2] pinctrl: rockchip: fix restore error in resume
And in general, kernel tooling will grab received Reviewed-by tags
automatically nowadays, so no need to send new versions just for that.
Heiko
Am Dienstag, 23. Februar 2021, 11:07:25 CET schrieb Jianqun Xu:
> From: Wang Panzhenzhuan <randy.wang@rock-chips.com>
>
> 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>
> ---
> drivers/pinctrl/pinctrl-rockchip.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
> index aa1a1c850d05..53a0badc6b03 100644
> --- a/drivers/pinctrl/pinctrl-rockchip.c
> +++ b/drivers/pinctrl/pinctrl-rockchip.c
> @@ -3727,12 +3727,15 @@ static int __maybe_unused rockchip_pinctrl_suspend(struct device *dev)
> 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);
> }
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2021-02-23 10:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 6:48 [PATCH] pinctrl: rockchip: fix restore error in resume Jianqun Xu
2021-02-23 8:36 ` Heiko Stübner
2021-02-23 10:07 ` Jianqun Xu
2021-02-23 10:13 ` Heiko Stübner [this message]
2021-03-02 13:27 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9688540.oDFzTOozpa@diego \
--to=heiko@sntech.de \
--cc=jay.xu@rock-chips.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=randy.wang@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).