1 files changed, 0 insertions, 77 deletions
diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/include/mach/board-pba8.h
index 307f97b16e5b..4dfc67a4f45f 100644
--- a/arch/arm/mach-realview/include/mach/board-pba8.h
+++ b/arch/arm/mach-realview/include/mach/board-pba8.h
@@ -70,81 +70,4 @@
 #define REALVIEW_PBA8_PCI_IO_SIZE               0x1000          /* 4 Kb */
 #define REALVIEW_PBA8_PCI_MEM_SIZE              0x20000000      /* 512 MB */
-/*
- * Irqs
- */
-#define IRQ_PBA8_GIC_START                      32
-/* L220
-#define IRQ_PBA8_L220_EVENT     (IRQ_PBA8_GIC_START + 29)
-#define IRQ_PBA8_L220_SLAVE     (IRQ_PBA8_GIC_START + 30)
-#define IRQ_PBA8_L220_DECODE    (IRQ_PBA8_GIC_START + 31)
-*/
-/*
- * PB-A8 on-board gic irq sources
- */
-#define IRQ_PBA8_WATCHDOG       (IRQ_PBA8_GIC_START + 0)        /* Watchdog timer */
-#define IRQ_PBA8_SOFT           (IRQ_PBA8_GIC_START + 1)        /* Software interrupt */
-#define IRQ_PBA8_COMMRx         (IRQ_PBA8_GIC_START + 2)        /* Debug Comm Rx interrupt */
-#define IRQ_PBA8_COMMTx         (IRQ_PBA8_GIC_START + 3)        /* Debug Comm Tx interrupt */
-#define IRQ_PBA8_TIMER0_1       (IRQ_PBA8_GIC_START + 4)        /* Timer 0/1 (default timer) */
-#define IRQ_PBA8_TIMER2_3       (IRQ_PBA8_GIC_START + 5)        /* Timer 2/3 */
-#define IRQ_PBA8_GPIO0          (IRQ_PBA8_GIC_START + 6)        /* GPIO 0 */
-#define IRQ_PBA8_GPIO1          (IRQ_PBA8_GIC_START + 7)        /* GPIO 1 */
-#define IRQ_PBA8_GPIO2          (IRQ_PBA8_GIC_START + 8)        /* GPIO 2 */
-                                                                /* 9 reserved */
-#define IRQ_PBA8_RTC            (IRQ_PBA8_GIC_START + 10)       /* Real Time Clock */
-#define IRQ_PBA8_SSP            (IRQ_PBA8_GIC_START + 11)       /* Synchronous Serial Port */
-#define IRQ_PBA8_UART0          (IRQ_PBA8_GIC_START + 12)       /* UART 0 on development chip */
-#define IRQ_PBA8_UART1          (IRQ_PBA8_GIC_START + 13)       /* UART 1 on development chip */
-#define IRQ_PBA8_UART2          (IRQ_PBA8_GIC_START + 14)       /* UART 2 on development chip */
-#define IRQ_PBA8_UART3          (IRQ_PBA8_GIC_START + 15)       /* UART 3 on development chip */
-#define IRQ_PBA8_SCI            (IRQ_PBA8_GIC_START + 16)       /* Smart Card Interface */
-#define IRQ_PBA8_MMCI0A         (IRQ_PBA8_GIC_START + 17)       /* Multimedia Card 0A */
-#define IRQ_PBA8_MMCI0B         (IRQ_PBA8_GIC_START + 18)       /* Multimedia Card 0B */
-#define IRQ_PBA8_AACI           (IRQ_PBA8_GIC_START + 19)       /* Audio Codec */
-#define IRQ_PBA8_KMI0           (IRQ_PBA8_GIC_START + 20)       /* Keyboard/Mouse port 0 */
-#define IRQ_PBA8_KMI1           (IRQ_PBA8_GIC_START + 21)       /* Keyboard/Mouse port 1 */
-#define IRQ_PBA8_CHARLCD        (IRQ_PBA8_GIC_START + 22)       /* Character LCD */
-#define IRQ_PBA8_CLCD           (IRQ_PBA8_GIC_START + 23)       /* CLCD controller */
-#define IRQ_PBA8_DMAC           (IRQ_PBA8_GIC_START + 24)       /* DMA controller */
-#define IRQ_PBA8_PWRFAIL        (IRQ_PBA8_GIC_START + 25)       /* Power failure */
-#define IRQ_PBA8_PISMO          (IRQ_PBA8_GIC_START + 26)       /* PISMO interface */
-#define IRQ_PBA8_DoC            (IRQ_PBA8_GIC_START + 27)       /* Disk on Chip memory controller */
-#define IRQ_PBA8_ETH            (IRQ_PBA8_GIC_START + 28)       /* Ethernet controller */
-#define IRQ_PBA8_USB            (IRQ_PBA8_GIC_START + 29)       /* USB controller */
-#define IRQ_PBA8_TSPEN          (IRQ_PBA8_GIC_START + 30)       /* Touchscreen pen */
-#define IRQ_PBA8_TSKPAD         (IRQ_PBA8_GIC_START + 31)       /* Touchscreen keypad */
-/* ... */
-#define IRQ_PBA8_PCI0           (IRQ_PBA8_GIC_START + 50)
-#define IRQ_PBA8_PCI1           (IRQ_PBA8_GIC_START + 51)
-#define IRQ_PBA8_PCI2           (IRQ_PBA8_GIC_START + 52)
-#define IRQ_PBA8_PCI3           (IRQ_PBA8_GIC_START + 53)
-#define IRQ_PBA8_SMC            -1
-#define IRQ_PBA8_SCTL           -1
-#define NR_GIC_PBA8             1
-/*
- * Only define NR_IRQS if less than NR_IRQS_PBA8
- */
-#define NR_IRQS_PBA8            (IRQ_PBA8_GIC_START + 64)
-#if defined(CONFIG_MACH_REALVIEW_PBA8)
-#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PBA8)
-#undef NR_IRQS
-#define NR_IRQS                 NR_IRQS_PBA8
-#endif
-#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PBA8)
-#undef MAX_GIC_NR
-#define MAX_GIC_NR              NR_GIC_PBA8
-#endif
-#endif  /* CONFIG_MACH_REALVIEW_PBA8 */
 #endif  /* __ASM_ARCH_BOARD_PBA8_H */

diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/include/mach/board-pba8.h index 307f97b16e5b..4dfc67a4f45f 100644 --- a/arch/arm/mach-realview/include/mach/board-pba8.h +++ b/arch/arm/mach-realview/include/mach/board-pba8.h
@@ -70,81 +70,4 @@
70	#define REALVIEW_PBA8_PCI_IO_SIZE 0x1000 /* 4 Kb */	70	#define REALVIEW_PBA8_PCI_IO_SIZE 0x1000 /* 4 Kb */
71	#define REALVIEW_PBA8_PCI_MEM_SIZE 0x20000000 /* 512 MB */	71	#define REALVIEW_PBA8_PCI_MEM_SIZE 0x20000000 /* 512 MB */
72		72
73	/*
74	* Irqs
75	*/
76	#define IRQ_PBA8_GIC_START 32
77
78	/* L220
79	#define IRQ_PBA8_L220_EVENT (IRQ_PBA8_GIC_START + 29)
80	#define IRQ_PBA8_L220_SLAVE (IRQ_PBA8_GIC_START + 30)
81	#define IRQ_PBA8_L220_DECODE (IRQ_PBA8_GIC_START + 31)
82	*/
83
84	/*
85	* PB-A8 on-board gic irq sources
86	*/
87	#define IRQ_PBA8_WATCHDOG (IRQ_PBA8_GIC_START + 0) /* Watchdog timer */
88	#define IRQ_PBA8_SOFT (IRQ_PBA8_GIC_START + 1) /* Software interrupt */
89	#define IRQ_PBA8_COMMRx (IRQ_PBA8_GIC_START + 2) /* Debug Comm Rx interrupt */
90	#define IRQ_PBA8_COMMTx (IRQ_PBA8_GIC_START + 3) /* Debug Comm Tx interrupt */
91	#define IRQ_PBA8_TIMER0_1 (IRQ_PBA8_GIC_START + 4) /* Timer 0/1 (default timer) */
92	#define IRQ_PBA8_TIMER2_3 (IRQ_PBA8_GIC_START + 5) /* Timer 2/3 */
93	#define IRQ_PBA8_GPIO0 (IRQ_PBA8_GIC_START + 6) /* GPIO 0 */
94	#define IRQ_PBA8_GPIO1 (IRQ_PBA8_GIC_START + 7) /* GPIO 1 */
95	#define IRQ_PBA8_GPIO2 (IRQ_PBA8_GIC_START + 8) /* GPIO 2 */
96	/* 9 reserved */
97	#define IRQ_PBA8_RTC (IRQ_PBA8_GIC_START + 10) /* Real Time Clock */
98	#define IRQ_PBA8_SSP (IRQ_PBA8_GIC_START + 11) /* Synchronous Serial Port */
99	#define IRQ_PBA8_UART0 (IRQ_PBA8_GIC_START + 12) /* UART 0 on development chip */
100	#define IRQ_PBA8_UART1 (IRQ_PBA8_GIC_START + 13) /* UART 1 on development chip */
101	#define IRQ_PBA8_UART2 (IRQ_PBA8_GIC_START + 14) /* UART 2 on development chip */
102	#define IRQ_PBA8_UART3 (IRQ_PBA8_GIC_START + 15) /* UART 3 on development chip */
103	#define IRQ_PBA8_SCI (IRQ_PBA8_GIC_START + 16) /* Smart Card Interface */
104	#define IRQ_PBA8_MMCI0A (IRQ_PBA8_GIC_START + 17) /* Multimedia Card 0A */
105	#define IRQ_PBA8_MMCI0B (IRQ_PBA8_GIC_START + 18) /* Multimedia Card 0B */
106	#define IRQ_PBA8_AACI (IRQ_PBA8_GIC_START + 19) /* Audio Codec */
107	#define IRQ_PBA8_KMI0 (IRQ_PBA8_GIC_START + 20) /* Keyboard/Mouse port 0 */
108	#define IRQ_PBA8_KMI1 (IRQ_PBA8_GIC_START + 21) /* Keyboard/Mouse port 1 */
109	#define IRQ_PBA8_CHARLCD (IRQ_PBA8_GIC_START + 22) /* Character LCD */
110	#define IRQ_PBA8_CLCD (IRQ_PBA8_GIC_START + 23) /* CLCD controller */
111	#define IRQ_PBA8_DMAC (IRQ_PBA8_GIC_START + 24) /* DMA controller */
112	#define IRQ_PBA8_PWRFAIL (IRQ_PBA8_GIC_START + 25) /* Power failure */
113	#define IRQ_PBA8_PISMO (IRQ_PBA8_GIC_START + 26) /* PISMO interface */
114	#define IRQ_PBA8_DoC (IRQ_PBA8_GIC_START + 27) /* Disk on Chip memory controller */
115	#define IRQ_PBA8_ETH (IRQ_PBA8_GIC_START + 28) /* Ethernet controller */
116	#define IRQ_PBA8_USB (IRQ_PBA8_GIC_START + 29) /* USB controller */
117	#define IRQ_PBA8_TSPEN (IRQ_PBA8_GIC_START + 30) /* Touchscreen pen */
118	#define IRQ_PBA8_TSKPAD (IRQ_PBA8_GIC_START + 31) /* Touchscreen keypad */
119
120	/* ... */
121	#define IRQ_PBA8_PCI0 (IRQ_PBA8_GIC_START + 50)
122	#define IRQ_PBA8_PCI1 (IRQ_PBA8_GIC_START + 51)
123	#define IRQ_PBA8_PCI2 (IRQ_PBA8_GIC_START + 52)
124	#define IRQ_PBA8_PCI3 (IRQ_PBA8_GIC_START + 53)
125
126	#define IRQ_PBA8_SMC -1
127	#define IRQ_PBA8_SCTL -1
128
129	#define NR_GIC_PBA8 1
130
131	/*
132	* Only define NR_IRQS if less than NR_IRQS_PBA8
133	*/
134	#define NR_IRQS_PBA8 (IRQ_PBA8_GIC_START + 64)
135
136	#if defined(CONFIG_MACH_REALVIEW_PBA8)
137
138	#if !defined(NR_IRQS) \|\| (NR_IRQS < NR_IRQS_PBA8)
139	#undef NR_IRQS
140	#define NR_IRQS NR_IRQS_PBA8
141	#endif
142
143	#if !defined(MAX_GIC_NR) \|\| (MAX_GIC_NR < NR_GIC_PBA8)
144	#undef MAX_GIC_NR
145	#define MAX_GIC_NR NR_GIC_PBA8
146	#endif
147
148	#endif /* CONFIG_MACH_REALVIEW_PBA8 */
149
150	#endif /* __ASM_ARCH_BOARD_PBA8_H */	73	#endif /* __ASM_ARCH_BOARD_PBA8_H */