summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorLudovic Barre <ludovic.barre@st.com>2017-11-06 18:03:36 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2017-11-07 11:44:43 +0000
commit90af7c254ffb94b0df47bf6f613e3f3173df05d1 (patch)
tree16c4de9e24a4d167750515c4a3b48f85ef155b8a /drivers/irqchip
parent2ca6b9bcaad4a78af255be9e16b3f3062a6d7c32 (diff)
downloadlinux-90af7c254ffb94b0df47bf6f613e3f3173df05d1.tar.gz
linux-90af7c254ffb94b0df47bf6f613e3f3173df05d1.tar.bz2
linux-90af7c254ffb94b0df47bf6f613e3f3173df05d1.zip
irqchip/stm32: Move the wakeup on interrupt mask
Move irq_set_wake on interrupt mask, needed to wake up from low power mode as the event mask is not able to do so. Signed-off-by: Ludovic Barre <ludovic.barre@st.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-stm32-exti.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
index 477d0faf0ea2..31ab0dee2ce7 100644
--- a/drivers/irqchip/irq-stm32-exti.c
+++ b/drivers/irqchip/irq-stm32-exti.c
@@ -156,16 +156,16 @@ static int stm32_irq_set_wake(struct irq_data *data, unsigned int on)
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
const struct stm32_exti_bank *stm32_bank = gc->private;
int pin = data->hwirq % IRQS_PER_BANK;
- u32 emr;
+ u32 imr;
irq_gc_lock(gc);
- emr = irq_reg_readl(gc, stm32_bank->emr_ofst);
+ imr = irq_reg_readl(gc, stm32_bank->imr_ofst);
if (on)
- emr |= BIT(pin);
+ imr |= BIT(pin);
else
- emr &= ~BIT(pin);
- irq_reg_writel(gc, emr, stm32_bank->emr_ofst);
+ imr &= ~BIT(pin);
+ irq_reg_writel(gc, imr, stm32_bank->imr_ofst);
irq_gc_unlock(gc);