Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6860107a authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

[ARM] 5594/1: Correct U300 VIC init PM setting 



This makes the VIC resume from suspend flagged IRQ:s identical to
the flags indicating all possible interrupts. This is perhaps not
the optimal setting but setting it to 0 makes the system suspend
and never come back again (all IRQ sources masked off).

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a0b98ec8

arch/arm/mach-u300/core.c

+2 −2
Original line number Diff line number Diff line
@@ -455,8 +455,8 @@ void __init u300_init_irq(void) 
	for (i = 0; i < NR_IRQS; i++)

		set_bit(i, (unsigned long *) &mask[0]);

	u300_enable_intcon_clock();

	vic_init((void __iomem *) U300_INTCON0_VBASE, 0, mask[0], 0);

	vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1], 0);

	vic_init((void __iomem *) U300_INTCON0_VBASE, 0, mask[0], mask[0]);

	vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1], mask[1]);

}