summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2018-08-02 11:14:13 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2018-08-02 11:14:13 -0400
commitbf4fffd69fe7a01feb6e9b33f2f960e416c7024e (patch)
treeca2fba5255e5433b733e64c1cce3fd3042724e7c
parent1348704cb4f7cf9d5a09fe686c3900a51fcdab6c (diff)
downloadlongterm-queue-4.12-bf4fffd69fe7a01feb6e9b33f2f960e416c7024e.tar.gz
pinctrl: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch b/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch
index 807e65a..eca9ab3 100644
--- a/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch
+++ b/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch
@@ -1,4 +1,4 @@
-From d2b3c353595a855794f8b9df5b5bdbe8deb0c413 Mon Sep 17 00:00:00 2001
+From b008d1e3f997e8b122544afe903daa005751ad8d Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Mon, 4 Dec 2017 12:11:02 +0300
Subject: [PATCH] pinctrl: cherryview: Mask all interrupts on Intel_Strago
@@ -19,13 +19,14 @@ Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
-index bdedb6325c72..4471fd94e1fe 100644
+index 04e929fd0ffe..931722810d42 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
-@@ -1620,6 +1620,22 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
- clear_bit(i, chip->irq.valid_mask);
+@@ -1619,6 +1619,22 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
+ clear_bit(i, chip->irq_valid_mask);
}
+ /*