3c1f6e358d
Patches are generated using the "format-patch" command from the following location: *https://www.codeaurora.org/cgit/quic/kernel/galak-msm/log/?h=apq_ipq_base *rev=0771849495b4128cac2faf7d49c85c729fc48b20 Patches numbered 76/77/102/103 have already been integrated in 3.14.12, so they're not in this list. All these patches are either integrated are pending integration into kernel.org, therefore these patches should go away once the kernel gets upgraded to 3.16. Support is currently limited to AP148 board but can be extended to other platforms in the future. These changes do not cover ethernet connectivity. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 42334
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 32787a9bba5a1ebeea891fd7aab954e6d344892a Mon Sep 17 00:00:00 2001
|
|
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
|
Date: Mon, 31 Mar 2014 14:49:54 -0700
|
|
Subject: [PATCH 036/182] pinctrl: msm: Correct interrupt code for TLMM v2
|
|
|
|
Acking interrupts are done differently between on v2 and v3, so add an extra
|
|
attribute to the pingroup struct to let the platform definitions control this.
|
|
Also make sure to start dual edge detection by detecting the rising edge.
|
|
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/pinctrl-msm.c | 6 +++++-
|
|
drivers/pinctrl/pinctrl-msm.h | 1 +
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
|
|
index 343f421..706809e 100644
|
|
--- a/drivers/pinctrl/pinctrl-msm.c
|
|
+++ b/drivers/pinctrl/pinctrl-msm.c
|
|
@@ -665,7 +665,10 @@ static void msm_gpio_irq_ack(struct irq_data *d)
|
|
spin_lock_irqsave(&pctrl->lock, flags);
|
|
|
|
val = readl(pctrl->regs + g->intr_status_reg);
|
|
- val &= ~BIT(g->intr_status_bit);
|
|
+ if (g->intr_ack_high)
|
|
+ val |= BIT(g->intr_status_bit);
|
|
+ else
|
|
+ val &= ~BIT(g->intr_status_bit);
|
|
writel(val, pctrl->regs + g->intr_status_reg);
|
|
|
|
if (test_bit(d->hwirq, pctrl->dual_edge_irqs))
|
|
@@ -744,6 +747,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
|
|
break;
|
|
case IRQ_TYPE_EDGE_BOTH:
|
|
val |= BIT(g->intr_detection_bit);
|
|
+ val |= BIT(g->intr_polarity_bit);
|
|
break;
|
|
case IRQ_TYPE_LEVEL_LOW:
|
|
break;
|
|
diff --git a/drivers/pinctrl/pinctrl-msm.h b/drivers/pinctrl/pinctrl-msm.h
|
|
index 8fbe9fb..6e26f1b 100644
|
|
--- a/drivers/pinctrl/pinctrl-msm.h
|
|
+++ b/drivers/pinctrl/pinctrl-msm.h
|
|
@@ -84,6 +84,7 @@ struct msm_pingroup {
|
|
|
|
unsigned intr_enable_bit:5;
|
|
unsigned intr_status_bit:5;
|
|
+ unsigned intr_ack_high:1;
|
|
|
|
unsigned intr_target_bit:5;
|
|
unsigned intr_raw_status_bit:5;
|
|
--
|
|
1.7.10.4
|
|
|