Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/pinctrl-lewisburg-update-number-of-pins-in-community.patch b/queue-4.14/pinctrl-lewisburg-update-number-of-pins-in-community.patch
new file mode 100644 (file)
index 0000000..0587bf6
--- /dev/null
+++ b/queue-4.14/pinctrl-lewisburg-update-number-of-pins-in-community.patch
@@ -0,0 +1,40 @@
+From 3e6263a528167e8da8846bfb9de9fab4fe352974 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 12 Apr 2021 17:17:59 -0600
+Subject: pinctrl: lewisburg: Update number of pins in community
+
+From: Yuanyuan Zhong <yzhong@purestorage.com>
+
+[ Upstream commit 196d941753297d0ca73c563ccd7d00be049ec226 ]
+
+When updating pin names for Intel Lewisburg, the numbers of pins were
+left behind. Update them accordingly.
+
+Fixes: e66ff71fd0db ("pinctrl: lewisburg: Update pin list according to v1.1v6")
+Signed-off-by: Yuanyuan Zhong <yzhong@purestorage.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/pinctrl/intel/pinctrl-lewisburg.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/pinctrl/intel/pinctrl-lewisburg.c b/drivers/pinctrl/intel/pinctrl-lewisburg.c
+index c2164db14e9c..9fdcae3260e8 100644
+--- a/drivers/pinctrl/intel/pinctrl-lewisburg.c
++++ b/drivers/pinctrl/intel/pinctrl-lewisburg.c
+@@ -300,9 +300,9 @@ static const struct pinctrl_pin_desc lbg_pins[] = {
+ static const struct intel_community lbg_communities[] = {
+       LBG_COMMUNITY(0, 0, 71),
+       LBG_COMMUNITY(1, 72, 132),
+-      LBG_COMMUNITY(3, 133, 144),
+-      LBG_COMMUNITY(4, 145, 180),
+-      LBG_COMMUNITY(5, 181, 246),
++      LBG_COMMUNITY(3, 133, 143),
++      LBG_COMMUNITY(4, 144, 178),
++      LBG_COMMUNITY(5, 179, 246),
+ };
+ 
+ static const struct intel_pinctrl_soc_data lbg_soc_data = {
+-- 
+2.30.2
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 990c890374742fbaf84ce7c5035d79e36a850702..fef95e60d14a4d80e594f5e491e22a5e1288b27e 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -36,3 +36,4 @@ arm-9071-1-uprobes-don-t-hook-on-thumb-instructions.patch
 gup-document-and-work-around-cow-can-break-either-way-issue.patch
 net-hso-fix-null-ptr-deref-during-tty-device-unregistration.patch
 ext4-correct-error-label-in-ext4_rename.patch
+pinctrl-lewisburg-update-number-of-pins-in-community.patch