diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 22:15:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 22:15:30 +0000 |
| commit | fdb0a1a67e131f07a308730c80d07e330211d2e0 (patch) | |
| tree | 4fbf35055fc965737c1ffdbcfe98d7ea8335f940 /arch/arm/include | |
| parent | fc0b7a20368193e1f7cf1376624eed419b9c33e6 (diff) | |
| parent | 7bb56d01f111890414fbe35412698485b68ed468 (diff) | |
| download | linux-3.10-fdb0a1a67e131f07a308730c80d07e330211d2e0.tar.gz linux-3.10-fdb0a1a67e131f07a308730c80d07e330211d2e0.tar.bz2 linux-3.10-fdb0a1a67e131f07a308730c80d07e330211d2e0.zip | |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/hardware/vic.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/include/asm/hardware/vic.h b/arch/arm/include/asm/hardware/vic.h index 263f2c362a3..f87328d4a18 100644 --- a/arch/arm/include/asm/hardware/vic.h +++ b/arch/arm/include/asm/hardware/vic.h @@ -29,15 +29,17 @@ #define VIC_INT_SOFT 0x18 #define VIC_INT_SOFT_CLEAR 0x1c #define VIC_PROTECT 0x20 -#define VIC_VECT_ADDR 0x30 -#define VIC_DEF_VECT_ADDR 0x34 +#define VIC_PL190_VECT_ADDR 0x30 /* PL190 only */ +#define VIC_PL190_DEF_VECT_ADDR 0x34 /* PL190 only */ -#define VIC_VECT_ADDR0 0x100 /* 0 to 15 */ -#define VIC_VECT_CNTL0 0x200 /* 0 to 15 */ +#define VIC_VECT_ADDR0 0x100 /* 0 to 15 (0..31 PL192) */ +#define VIC_VECT_CNTL0 0x200 /* 0 to 15 (0..31 PL192) */ #define VIC_ITCR 0x300 /* VIC test control register */ #define VIC_VECT_CNTL_ENABLE (1 << 5) +#define VIC_PL192_VECT_ADDR 0xF00 + #ifndef __ASSEMBLY__ void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources); #endif |