diff options
| author | Linus Walleij <linus.walleij@stericsson.com> | 2009-07-06 18:04:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-09 16:15:46 +0100 |
| commit | 6860107a46c8762d35eb7bf71bcf6c6510793b76 (patch) | |
| tree | 0e674aa38ee238b89baaf0298e651d90072e09cc /arch/arm | |
| parent | a0b98ec87d7a293a7d9ab8e45935c53a68f3094a (diff) | |
| download | linux-3.10-6860107a46c8762d35eb7bf71bcf6c6510793b76.tar.gz linux-3.10-6860107a46c8762d35eb7bf71bcf6c6510793b76.tar.bz2 linux-3.10-6860107a46c8762d35eb7bf71bcf6c6510793b76.zip | |
[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: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-u300/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 89b3ccf35e1..7936085dd75 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -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]); } |