Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / ipic.h

diff --git a/arch/powerpc/sysdev/ipic.h b/arch/powerpc/sysdev/ipic.h
index a7ce7da8785c4c2ef256dd8144f9e2aa4cff7126..9391c57b0c5115814b56c3c6a6b740e20455ddde 100644 (file)
--- a/arch/powerpc/sysdev/ipic.h
+++ b/arch/powerpc/sysdev/ipic.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/ipic.h
- *
  * IPIC private definitions and structure.
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@ -17,10 +15,20 @@
 
 #include <asm/ipic.h>
 
-#define MPC83xx_IPIC_SIZE      (0x00100)
+#define NR_IPIC_INTS 128
+
+/* External IRQS */
+#define IPIC_IRQ_EXT0 48
+#define IPIC_IRQ_EXT1 17
+#define IPIC_IRQ_EXT7 23
+
+/* Default Priority Registers */
+#define IPIC_PRIORITY_DEFAULT 0x05309770
 
 /* System Global Interrupt Configuration Register */
 #define        SICFR_IPSA      0x00010000
+#define        SICFR_IPSB      0x00020000
+#define        SICFR_IPSC      0x00040000
 #define        SICFR_IPSD      0x00080000
 #define        SICFR_MPSA      0x00200000
 #define        SICFR_MPSB      0x00400000
@@ -33,11 +41,14 @@
 
 struct ipic {
        volatile u32 __iomem    *regs;
-       unsigned int            irq_offset;
+
+       /* The remapper for this IPIC */
+       struct irq_host         *irqhost;
 };
 
 struct ipic_info {
-       u8      pend;           /* pending register offset from base */
+       u8      ack;            /* pending register offset from base if the irq
+                                  supports ack operation */
        u8      mask;           /* mask register offset from base */
        u8      prio;           /* priority register offset from base */
        u8      force;          /* force register offset from base */