1 files changed, 2 insertions, 78 deletions
diff --git a/arch/arm/mach-realview/include/mach/board-pb1176.h b/arch/arm/mach-realview/include/mach/board-pb1176.h
index 858eea7b1adc..98f8e7eeacc2 100644
--- a/arch/arm/mach-realview/include/mach/board-pb1176.h
+++ b/arch/arm/mach-realview/include/mach/board-pb1176.h
@@ -32,6 +32,8 @@
 #define REALVIEW_PB1176_SDRAM67_BASE            0x70000000 /* SDRAM banks 6 and 7 */
 #define REALVIEW_PB1176_FLASH_BASE              0x30000000
 #define REALVIEW_PB1176_FLASH_SIZE              SZ_64M
+#define REALVIEW_PB1176_SEC_FLASH_BASE          0x3C000000 /* Secure flash */
+#define REALVIEW_PB1176_SEC_FLASH_SIZE          SZ_64M
 #define REALVIEW_PB1176_TIMER0_1_BASE           0x10104000 /* Timer 0 and 1 */
 #define REALVIEW_PB1176_TIMER2_3_BASE           0x10105000 /* Timer 2 and 3 */
@@ -71,82 +73,4 @@
 #define REALVIEW_PB1176_GIC_DIST_BASE           0x10041000 /* GIC distributor, on FPGA */
 #define REALVIEW_PB1176_L220_BASE               0x10110000 /* L220 registers */
-/*
- * Irqs
- */
-#define IRQ_DC1176_GIC_START                    32
-#define IRQ_PB1176_GIC_START                    64
-/*
- * ARM1176 DevChip interrupt sources (primary GIC)
- */
-#define IRQ_DC1176_WATCHDOG     (IRQ_DC1176_GIC_START + 0)      /* Watchdog timer */
-#define IRQ_DC1176_SOFTINT      (IRQ_DC1176_GIC_START + 1)      /* Software interrupt */
-#define IRQ_DC1176_COMMRx       (IRQ_DC1176_GIC_START + 2)      /* Debug Comm Rx interrupt */
-#define IRQ_DC1176_COMMTx       (IRQ_DC1176_GIC_START + 3)      /* Debug Comm Tx interrupt */
-#define IRQ_DC1176_TIMER0       (IRQ_DC1176_GIC_START + 8)      /* Timer 0 */
-#define IRQ_DC1176_TIMER1       (IRQ_DC1176_GIC_START + 9)      /* Timer 1 */
-#define IRQ_DC1176_TIMER2       (IRQ_DC1176_GIC_START + 10)     /* Timer 2 */
-#define IRQ_DC1176_APC          (IRQ_DC1176_GIC_START + 11)
-#define IRQ_DC1176_IEC          (IRQ_DC1176_GIC_START + 12)
-#define IRQ_DC1176_L2CC         (IRQ_DC1176_GIC_START + 13)
-#define IRQ_DC1176_RTC          (IRQ_DC1176_GIC_START + 14)
-#define IRQ_DC1176_CLCD         (IRQ_DC1176_GIC_START + 15)     /* CLCD controller */
-#define IRQ_DC1176_UART0        (IRQ_DC1176_GIC_START + 18)     /* UART 0 on development chip */
-#define IRQ_DC1176_UART1        (IRQ_DC1176_GIC_START + 19)     /* UART 1 on development chip */
-#define IRQ_DC1176_UART2        (IRQ_DC1176_GIC_START + 20)     /* UART 2 on development chip */
-#define IRQ_DC1176_UART3        (IRQ_DC1176_GIC_START + 21)     /* UART 3 on development chip */
-#define IRQ_DC1176_PB_IRQ2      (IRQ_DC1176_GIC_START + 30)     /* tile GIC */
-#define IRQ_DC1176_PB_IRQ1      (IRQ_DC1176_GIC_START + 31)     /* main GIC */
-/*
- * RealView PB1176 interrupt sources (secondary GIC)
- */
-#define IRQ_PB1176_MMCI0A       (IRQ_PB1176_GIC_START + 1)      /* Multimedia Card 0A */
-#define IRQ_PB1176_MMCI0B       (IRQ_PB1176_GIC_START + 2)      /* Multimedia Card 0A */
-#define IRQ_PB1176_KMI0         (IRQ_PB1176_GIC_START + 3)      /* Keyboard/Mouse port 0 */
-#define IRQ_PB1176_KMI1         (IRQ_PB1176_GIC_START + 4)      /* Keyboard/Mouse port 1 */
-#define IRQ_PB1176_SCI          (IRQ_PB1176_GIC_START + 5)
-#define IRQ_PB1176_UART4        (IRQ_PB1176_GIC_START + 6)      /* UART 4 on baseboard */
-#define IRQ_PB1176_CHARLCD      (IRQ_PB1176_GIC_START + 7)      /* Character LCD */
-#define IRQ_PB1176_GPIO1        (IRQ_PB1176_GIC_START + 8)
-#define IRQ_PB1176_GPIO2        (IRQ_PB1176_GIC_START + 9)
-#define IRQ_PB1176_ETH          (IRQ_PB1176_GIC_START + 10)     /* Ethernet controller */
-#define IRQ_PB1176_USB          (IRQ_PB1176_GIC_START + 11)     /* USB controller */
-#define IRQ_PB1176_PISMO        (IRQ_PB1176_GIC_START + 16)
-#define IRQ_PB1176_AACI         (IRQ_PB1176_GIC_START + 19)     /* Audio Codec */
-#define IRQ_PB1176_TIMER0_1     (IRQ_PB1176_GIC_START + 22)
-#define IRQ_PB1176_TIMER2_3     (IRQ_PB1176_GIC_START + 23)
-#define IRQ_PB1176_DMAC         (IRQ_PB1176_GIC_START + 24)     /* DMA controller */
-#define IRQ_PB1176_RTC          (IRQ_PB1176_GIC_START + 25)     /* Real Time Clock */
-#define IRQ_PB1176_GPIO0        -1
-#define IRQ_PB1176_SSP          -1
-#define IRQ_PB1176_SCTL         -1
-#define NR_GIC_PB1176           2
-/*
- * Only define NR_IRQS if less than NR_IRQS_PB1176
- */
-#define NR_IRQS_PB1176          (IRQ_DC1176_GIC_START + 96)
-#if defined(CONFIG_MACH_REALVIEW_PB1176)
-#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PB1176)
-#undef NR_IRQS
-#define NR_IRQS                 NR_IRQS_PB1176
-#endif
-#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PB1176)
-#undef MAX_GIC_NR
-#define MAX_GIC_NR              NR_GIC_PB1176
-#endif
-#endif  /* CONFIG_MACH_REALVIEW_PB1176 */
 #endif  /* __ASM_ARCH_BOARD_PB1176_H */

diff --git a/arch/arm/mach-realview/include/mach/board-pb1176.h b/arch/arm/mach-realview/include/mach/board-pb1176.h index 858eea7b1adc..98f8e7eeacc2 100644 --- a/arch/arm/mach-realview/include/mach/board-pb1176.h +++ b/arch/arm/mach-realview/include/mach/board-pb1176.h
@@ -32,6 +32,8 @@
32	#define REALVIEW_PB1176_SDRAM67_BASE 0x70000000 /* SDRAM banks 6 and 7 */	32	#define REALVIEW_PB1176_SDRAM67_BASE 0x70000000 /* SDRAM banks 6 and 7 */
33	#define REALVIEW_PB1176_FLASH_BASE 0x30000000	33	#define REALVIEW_PB1176_FLASH_BASE 0x30000000
34	#define REALVIEW_PB1176_FLASH_SIZE SZ_64M	34	#define REALVIEW_PB1176_FLASH_SIZE SZ_64M
		35	#define REALVIEW_PB1176_SEC_FLASH_BASE 0x3C000000 /* Secure flash */
		36	#define REALVIEW_PB1176_SEC_FLASH_SIZE SZ_64M
35		37
36	#define REALVIEW_PB1176_TIMER0_1_BASE 0x10104000 /* Timer 0 and 1 */	38	#define REALVIEW_PB1176_TIMER0_1_BASE 0x10104000 /* Timer 0 and 1 */
37	#define REALVIEW_PB1176_TIMER2_3_BASE 0x10105000 /* Timer 2 and 3 */	39	#define REALVIEW_PB1176_TIMER2_3_BASE 0x10105000 /* Timer 2 and 3 */
@@ -71,82 +73,4 @@
71	#define REALVIEW_PB1176_GIC_DIST_BASE 0x10041000 /* GIC distributor, on FPGA */	73	#define REALVIEW_PB1176_GIC_DIST_BASE 0x10041000 /* GIC distributor, on FPGA */
72	#define REALVIEW_PB1176_L220_BASE 0x10110000 /* L220 registers */	74	#define REALVIEW_PB1176_L220_BASE 0x10110000 /* L220 registers */
73		75
74	/*
75	* Irqs
76	*/
77	#define IRQ_DC1176_GIC_START 32
78	#define IRQ_PB1176_GIC_START 64
79
80	/*
81	* ARM1176 DevChip interrupt sources (primary GIC)
82	*/
83	#define IRQ_DC1176_WATCHDOG (IRQ_DC1176_GIC_START + 0) /* Watchdog timer */
84	#define IRQ_DC1176_SOFTINT (IRQ_DC1176_GIC_START + 1) /* Software interrupt */
85	#define IRQ_DC1176_COMMRx (IRQ_DC1176_GIC_START + 2) /* Debug Comm Rx interrupt */
86	#define IRQ_DC1176_COMMTx (IRQ_DC1176_GIC_START + 3) /* Debug Comm Tx interrupt */
87	#define IRQ_DC1176_TIMER0 (IRQ_DC1176_GIC_START + 8) /* Timer 0 */
88	#define IRQ_DC1176_TIMER1 (IRQ_DC1176_GIC_START + 9) /* Timer 1 */
89	#define IRQ_DC1176_TIMER2 (IRQ_DC1176_GIC_START + 10) /* Timer 2 */
90	#define IRQ_DC1176_APC (IRQ_DC1176_GIC_START + 11)
91	#define IRQ_DC1176_IEC (IRQ_DC1176_GIC_START + 12)
92	#define IRQ_DC1176_L2CC (IRQ_DC1176_GIC_START + 13)
93	#define IRQ_DC1176_RTC (IRQ_DC1176_GIC_START + 14)
94	#define IRQ_DC1176_CLCD (IRQ_DC1176_GIC_START + 15) /* CLCD controller */
95	#define IRQ_DC1176_UART0 (IRQ_DC1176_GIC_START + 18) /* UART 0 on development chip */
96	#define IRQ_DC1176_UART1 (IRQ_DC1176_GIC_START + 19) /* UART 1 on development chip */
97	#define IRQ_DC1176_UART2 (IRQ_DC1176_GIC_START + 20) /* UART 2 on development chip */
98	#define IRQ_DC1176_UART3 (IRQ_DC1176_GIC_START + 21) /* UART 3 on development chip */
99
100	#define IRQ_DC1176_PB_IRQ2 (IRQ_DC1176_GIC_START + 30) /* tile GIC */
101	#define IRQ_DC1176_PB_IRQ1 (IRQ_DC1176_GIC_START + 31) /* main GIC */
102
103	/*
104	* RealView PB1176 interrupt sources (secondary GIC)
105	*/
106	#define IRQ_PB1176_MMCI0A (IRQ_PB1176_GIC_START + 1) /* Multimedia Card 0A */
107	#define IRQ_PB1176_MMCI0B (IRQ_PB1176_GIC_START + 2) /* Multimedia Card 0A */
108	#define IRQ_PB1176_KMI0 (IRQ_PB1176_GIC_START + 3) /* Keyboard/Mouse port 0 */
109	#define IRQ_PB1176_KMI1 (IRQ_PB1176_GIC_START + 4) /* Keyboard/Mouse port 1 */
110	#define IRQ_PB1176_SCI (IRQ_PB1176_GIC_START + 5)
111	#define IRQ_PB1176_UART4 (IRQ_PB1176_GIC_START + 6) /* UART 4 on baseboard */
112	#define IRQ_PB1176_CHARLCD (IRQ_PB1176_GIC_START + 7) /* Character LCD */
113	#define IRQ_PB1176_GPIO1 (IRQ_PB1176_GIC_START + 8)
114	#define IRQ_PB1176_GPIO2 (IRQ_PB1176_GIC_START + 9)
115	#define IRQ_PB1176_ETH (IRQ_PB1176_GIC_START + 10) /* Ethernet controller */
116	#define IRQ_PB1176_USB (IRQ_PB1176_GIC_START + 11) /* USB controller */
117
118	#define IRQ_PB1176_PISMO (IRQ_PB1176_GIC_START + 16)
119
120	#define IRQ_PB1176_AACI (IRQ_PB1176_GIC_START + 19) /* Audio Codec */
121
122	#define IRQ_PB1176_TIMER0_1 (IRQ_PB1176_GIC_START + 22)
123	#define IRQ_PB1176_TIMER2_3 (IRQ_PB1176_GIC_START + 23)
124	#define IRQ_PB1176_DMAC (IRQ_PB1176_GIC_START + 24) /* DMA controller */
125	#define IRQ_PB1176_RTC (IRQ_PB1176_GIC_START + 25) /* Real Time Clock */
126
127	#define IRQ_PB1176_GPIO0 -1
128	#define IRQ_PB1176_SSP -1
129	#define IRQ_PB1176_SCTL -1
130
131	#define NR_GIC_PB1176 2
132
133	/*
134	* Only define NR_IRQS if less than NR_IRQS_PB1176
135	*/
136	#define NR_IRQS_PB1176 (IRQ_DC1176_GIC_START + 96)
137
138	#if defined(CONFIG_MACH_REALVIEW_PB1176)
139
140	#if !defined(NR_IRQS) \|\| (NR_IRQS < NR_IRQS_PB1176)
141	#undef NR_IRQS
142	#define NR_IRQS NR_IRQS_PB1176
143	#endif
144
145	#if !defined(MAX_GIC_NR) \|\| (MAX_GIC_NR < NR_GIC_PB1176)
146	#undef MAX_GIC_NR
147	#define MAX_GIC_NR NR_GIC_PB1176
148	#endif
149
150	#endif /* CONFIG_MACH_REALVIEW_PB1176 */
151
152	#endif /* __ASM_ARCH_BOARD_PB1176_H */	76	#endif /* __ASM_ARCH_BOARD_PB1176_H */