From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 3 Apr 2021 09:29:37 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.265~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c6e2778798df6f5b6418051bffa124f57a9147;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

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

diff --git a/queue-4.14/pinctrl-rockchip-fix-restore-error-in-resume.patch b/queue-4.14/pinctrl-rockchip-fix-restore-error-in-resume.patch
new file mode 100644
index 00000000000..8578c0cc685
--- /dev/null
+++ b/queue-4.14/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
+@@ -3121,12 +3121,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.14/series b/queue-4.14/series
index 4179322da80..8336b6b2b41 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -34,3 +34,4 @@ mm-memcg-make-sure-memory.events-is-uptodate-when-waking-pollers.patch
 mem_cgroup-make-sure-moving_account-move_lock_task-and-stat_cpu-in-the-same-cacheline.patch
 mm-fix-oom_kill-event-handling.patch
 mm-writeback-use-exact-memcg-dirty-counts.patch
+pinctrl-rockchip-fix-restore-error-in-resume.patch