diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-26 04:31:39 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-26 04:31:39 (GMT) |
| commit | b7b617c527224acd862274fc58ff16dd34ab6466 (patch) | |
| tree | ccdf4bff98006701db343eb61bc273ec3d49331a /arch/arm/mach-u300/core.c | |
| parent | 8ec7c84027272952ab6d21c340f4aada1a3e5988 (diff) | |
| parent | 1344500e2d79d09db81f748984697cbdd6b02279 (diff) | |
| download | linux-fsl-qoriq-b7b617c527224acd862274fc58ff16dd34ab6466.tar.xz | |
Merge branch 'u300-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
* 'u300-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: u300: bump all IRQ numbers by one
ARM: ux300: Fix unimplementable regulation constraints
Diffstat (limited to 'arch/arm/mach-u300/core.c')
| -rw-r--r-- | arch/arm/mach-u300/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 1621ad0..3333974 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -1667,8 +1667,10 @@ void __init u300_init_irq(void) for (i = 0; i < U300_VIC_IRQS_END; i++) set_bit(i, (unsigned long *) &mask[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]); + vic_init((void __iomem *) U300_INTCON0_VBASE, IRQ_U300_INTCON0_START, + mask[0], mask[0]); + vic_init((void __iomem *) U300_INTCON1_VBASE, IRQ_U300_INTCON1_START, + mask[1], mask[1]); } |