tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux into fixes

This is the fixes set for v4.18 cycle.

This is a fix for suspending all pxa3xx platforms, where high
number interrupts are not reenabled.

* tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux:
ARM: pxa: irq: fix handling of ICMR registers in suspend/resume

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson 4dbd2b42 f0463f36

+2 -2
unified split
+2 -2
arch/arm/mach-pxa/irq.c
··· 185 { 186 int i; 187 188 - for (i = 0; i < pxa_internal_irq_nr / 32; i++) { 189 void __iomem *base = irq_base(i); 190 191 saved_icmr[i] = __raw_readl(base + ICMR); ··· 204 { 205 int i; 206 207 - for (i = 0; i < pxa_internal_irq_nr / 32; i++) { 208 void __iomem *base = irq_base(i); 209 210 __raw_writel(saved_icmr[i], base + ICMR);
··· 185 { 186 int i; 187 188 + for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) { 189 void __iomem *base = irq_base(i); 190 191 saved_icmr[i] = __raw_readl(base + ICMR); ··· 204 { 205 int i; 206 207 + for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) { 208 void __iomem *base = irq_base(i); 209 210 __raw_writel(saved_icmr[i], base + ICMR);