diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-20 13:43:47 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-20 13:43:47 +1000 |
| commit | 3d07f0e83d4323d2cd45cc583f7cf1957aca3cac (patch) | |
| tree | 279203d24b3a366ed6da93a3f9664409eb1a8488 /arch/powerpc/include/asm/mpic.h | |
| parent | 593adf317cf165f7c66facf2285db9d4befbd1c0 (diff) | |
| parent | bbfff72ee3e76bd4712b87386af00bfe97114bc9 (diff) | |
| download | op-kernel-dev-3d07f0e83d4323d2cd45cc583f7cf1957aca3cac.zip op-kernel-dev-3d07f0e83d4323d2cd45cc583f7cf1957aca3cac.tar.gz | |
Merge remote branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/include/asm/mpic.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index 7005ee0..664bee66 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h @@ -263,6 +263,7 @@ struct mpic #ifdef CONFIG_SMP struct irq_chip hc_ipi; #endif + struct irq_chip hc_tm; const char *name; /* Flags */ unsigned int flags; @@ -281,7 +282,7 @@ struct mpic /* vector numbers used for internal sources (ipi/timers) */ unsigned int ipi_vecs[4]; - unsigned int timer_vecs[4]; + unsigned int timer_vecs[8]; /* Spurious vector to program into unused sources */ unsigned int spurious_vec; @@ -371,6 +372,8 @@ struct mpic * NOTE: This flag trumps MPIC_WANTS_RESET. */ #define MPIC_NO_RESET 0x00004000 +/* Freescale MPIC (compatible includes "fsl,mpic") */ +#define MPIC_FSL 0x00008000 /* MPIC HW modification ID */ #define MPIC_REGSET_MASK 0xf0000000 |
