patch-2.4.22 linux-2.4.22/include/asm-arm/arch-sa1100/irqs.h

• Lines: 61
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-arm/arch-sa1100/irqs.h
• Orig date: 2002-08-02 17:39:45.000000000 -0700

diff -urN linux-2.4.21/include/asm-arm/arch-sa1100/irqs.h linux-2.4.22/include/asm-arm/arch-sa1100/irqs.h
@@ -130,13 +130,12 @@
  * Figure out the MAX IRQ number.
  *
  * If we have an SA1111, the max IRQ is S1_BVD1_STSCHG+1.
- * If graphicsclient or graphicsmaster, we don't have a SA1111.
+ * If graphicsclient we don't have a SA1111.
  * Otherwise, we have the standard IRQs only.
  */
 #ifdef CONFIG_SA1111
 #define NR_IRQS			(S1_BVD1_STSCHG + 1)
-#elif defined(CONFIG_SA1100_GRAPHICSCLIENT) || \
-      defined(CONFIG_SA1100_GRAPHICSMASTER)
+#elif defined(CONFIG_SA1100_GRAPHICSCLIENT)
 #define NR_IRQS			(IRQ_BOARD_END)
 #else
 #define NR_IRQS			(IRQ_BOARD_START)
@@ -151,3 +150,44 @@
 
 /* PT Digital Board Interrupts (CONFIG_SA1100_PT_SYSTEM3) */
 #define IRQ_SYSTEM3_SMC9196	(IRQ_BOARD_START + 0)
+
+/* ADS Graphics Client IRQs (CONFIG_SA1100_GRAPHICSCLIENT) */
+#define IRQ_GRAPHICSCLIENT_START   (IRQ_BOARD_START + 0)
+#define IRQ_GRAPHICSCLIENT_CAN     (IRQ_BOARD_START + 4)
+#define IRQ_GRAPHICSCLIENT_S0_CD   (IRQ_BOARD_START + 6)
+#define IRQ_GRAPHICSCLIENT_EXTIRQ  (IRQ_BOARD_START + 7)
+#define IRQ_GRAPHICSCLIENT_UCB1200 (IRQ_BOARD_START + 8)
+#define IRQ_GRAPHICSCLIENT_ETH     (IRQ_BOARD_START + 9)
+#define IRQ_GRAPHICSCLIENT_USB     (IRQ_BOARD_START + 10)
+#define IRQ_GRAPHICSCLIENT_S0_STS  (IRQ_BOARD_START + 11)
+#define IRQ_GRAPHICSCLIENT_SWITCH  (IRQ_BOARD_START + 13)
+#define IRQ_GRAPHICSCLIENT_AVR     (IRQ_BOARD_START + 14)
+#define IRQ_GRAPHICSCLIENT_BATFLT  (IRQ_BOARD_START + 15)
+#define IRQ_GRAPHICSCLIENT_END     (IRQ_BOARD_START + 16)
+
+/* ADS Graphics Master IRQs (CONFIG_SA1100_GRAPHICSMASTER) */
+
+#define IRQ_GRAPHICSMASTER_START   (IRQ_BOARD_START)
+#define IRQ_GRAPHICSMASTER_SA1111  (IRQ_BOARD_START + 0)
+#define IRQ_GRAPHICSMASTER_UART0   (IRQ_BOARD_START + 1)
+#define IRQ_GRAPHICSMASTER_UART1   (IRQ_BOARD_START + 2)
+#define IRQ_GRAPHICSMASTER_UART2   (IRQ_BOARD_START + 3)
+#define IRQ_GRAPHICSMASTER_CAN     (IRQ_BOARD_START + 4)
+#define IRQ_GRAPHICSMASTER_UART3   (IRQ_BOARD_START + 5)
+#define IRQ_GRAPHICSMASTER_FLASH   (IRQ_BOARD_START + 6)
+#define IRQ_GRAPHICSMASTER_EXTIRQ  (IRQ_BOARD_START + 7)
+#define IRQ_GRAPHICSMASTER_UCB1200 (IRQ_BOARD_START + 8)
+#define IRQ_GRAPHICSMASTER_ETH     (IRQ_BOARD_START + 9)
+#define IRQ_GRAPHICSMASTER_SWITCH  (IRQ_BOARD_START + 13)
+#define IRQ_GRAPHICSMASTER_AVR     (IRQ_BOARD_START + 14)
+#define IRQ_GRAPHICSMASTER_BATFLT  (IRQ_BOARD_START + 15)
+#define IRQ_GRAPHICSMASTER_END     (IRQ_BOARD_START + 16)
+
+/* ADS Advanced Graphics Client IRQs (CONFIG_SA1100 ADSAGC) */
+#define IRQ_ADSAGC_START           (IRQ_BOARD_START)
+#define IRQ_ADSAGC_AVR             (IRQ_BOARD_START + 0)
+#define IRQ_ADSAGC_CAN             (IRQ_BOARD_START + 1)
+#define IRQ_ADSAGC_ETH             (IRQ_BOARD_START + 2)
+#define IRQ_ADSAGC_EXTIRQ          (IRQ_BOARD_START + 3)
+#define IRQ_ADSAGC_END             (IRQ_BOARD_START + 4)
+