History

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

Olof Johansson committed 8 years ago

Commit 4dbd2b42 parents f0463f3 0c1049d1 file · +2 −2Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t