4.9-stable patches

added patches:
	pinctrl-rockchip-fix-restore-error-in-resume.patch

diff --git a/queue-4.9/pinctrl-rockchip-fix-restore-error-in-resume.patch b/queue-4.9/pinctrl-rockchip-fix-restore-error-in-resume.patch
new file mode 100644 (file)
index 0000000..8771c4d
--- /dev/null
+++ b/queue-4.9/pinctrl-rockchip-fix-restore-error-in-resume.patch
@@ -0,0 +1,47 @@
+From c971af25cda94afe71617790826a86253e88eab0 Mon Sep 17 00:00:00 2001
+From: Wang Panzhenzhuan <randy.wang@rock-chips.com>
+Date: Tue, 23 Feb 2021 18:07:25 +0800
+Subject: pinctrl: rockchip: fix restore error in resume
+
+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
+@@ -2367,12 +2367,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);
+ }

diff --git a/queue-4.9/series b/queue-4.9/series
index 2250fc272849e0b4be5ca0d722d69be2872bc6b3..48a842e945524ddff451d1de844fbff854b60b1e 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -21,3 +21,4 @@ alsa-hda-realtek-call-alc_update_headset_mode-in-hp_automute_hook.patch
 tracing-fix-stack-trace-event-size.patch
 mm-fix-race-by-making-init_zero_pfn-early_initcall.patch
 reiserfs-update-reiserfs_xattrs_initialized-condition.patch
+pinctrl-rockchip-fix-restore-error-in-resume.patch