summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 12:41:56 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 12:41:56 -0400
commit6d8de1ed5824e99fb6d3a7898dd5425d3b4ce6e8 (patch)
treee0ef606f1bf3017757076e10d8e4d9fb32715ee7
parentfb7a945bfdd7d3baea90b308f1db06093fb5e012 (diff)
downloadlongterm-queue-4.8-6d8de1ed5824e99fb6d3a7898dd5425d3b4ce6e8.tar.gz
pinctrl: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/pinctrl-qcom-Don-t-clear-status-bit-on-irq_unmask.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/pinctrl-qcom-Don-t-clear-status-bit-on-irq_unmask.patch b/queue/pinctrl-qcom-Don-t-clear-status-bit-on-irq_unmask.patch
index 5702cb4..28f96b6 100644
--- a/queue/pinctrl-qcom-Don-t-clear-status-bit-on-irq_unmask.patch
+++ b/queue/pinctrl-qcom-Don-t-clear-status-bit-on-irq_unmask.patch
@@ -1,4 +1,4 @@
-From a6566710adaa4a7dd5e0d99820ff9c9c30ee5951 Mon Sep 17 00:00:00 2001
+From e749065038a6388e04c3423dc52fce1a9ad759e2 Mon Sep 17 00:00:00 2001
From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Tue, 14 Mar 2017 08:23:26 -0700
Subject: [PATCH] pinctrl: qcom: Don't clear status bit on irq_unmask
@@ -17,12 +17,12 @@ Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
-index c978be5eb9eb..273badd92561 100644
+index 775c88303017..bedce3453dd3 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
-@@ -609,10 +609,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d)
+@@ -594,10 +594,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d)
- raw_spin_lock_irqsave(&pctrl->lock, flags);
+ spin_lock_irqsave(&pctrl->lock, flags);
- val = readl(pctrl->regs + g->intr_status_reg);
- val &= ~BIT(g->intr_status_bit);