Merge remote branch 'origin/master' into merge

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / powerpc / include / asm / mpic.h

diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 49baddc..df18989 100644 (file)
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -262,6 +262,7 @@ struct mpic
 #ifdef CONFIG_SMP
        struct irq_chip         hc_ipi;
 #endif
+       struct irq_chip         hc_tm;
        const char              *name;
        /* Flags */
        unsigned int            flags;
@@ -280,7 +281,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;
@@ -368,6 +369,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