4 files changed, 58 insertions, 58 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 2cad2bf864be..d688c1dbd925 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -301,28 +301,28 @@ void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks
 static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
        7,      /* Advanced Interrupt Controller (FIQ) */
        7,      /* System Peripherals */
-        0,      /* Parallel IO Controller A */
+        1,      /* Parallel IO Controller A */
-        0,      /* Parallel IO Controller B */
+        1,      /* Parallel IO Controller B */
-        0,      /* Parallel IO Controller C */
+        1,      /* Parallel IO Controller C */
-        0,      /* Parallel IO Controller D */
+        1,      /* Parallel IO Controller D */
-        6,      /* USART 0 */
+        5,      /* USART 0 */
-        6,      /* USART 1 */
+        5,      /* USART 1 */
-        6,      /* USART 2 */
+        5,      /* USART 2 */
-        6,      /* USART 3 */
+        5,      /* USART 3 */
        0,      /* Multimedia Card Interface */
-        4,      /* USB Device Port */
+        2,      /* USB Device Port */
-        0,      /* Two-Wire Interface */
+        6,      /* Two-Wire Interface */
-        6,      /* Serial Peripheral Interface */
+        5,      /* Serial Peripheral Interface */
-        5,      /* Serial Synchronous Controller 0 */
+        4,      /* Serial Synchronous Controller 0 */
-        5,      /* Serial Synchronous Controller 1 */
+        4,      /* Serial Synchronous Controller 1 */
-        5,      /* Serial Synchronous Controller 2 */
+        4,      /* Serial Synchronous Controller 2 */
        0,      /* Timer Counter 0 */
        0,      /* Timer Counter 1 */
        0,      /* Timer Counter 2 */
        0,      /* Timer Counter 3 */
        0,      /* Timer Counter 4 */
        0,      /* Timer Counter 5 */
-        3,      /* USB Host port */
+        2,      /* USB Host port */
        3,      /* Ethernet MAC */
        0,      /* Advanced Interrupt Controller (IRQ0) */
        0,      /* Advanced Interrupt Controller (IRQ1) */
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index e47381e8aaba..18d06612ce8a 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -327,30 +327,30 @@ void __init at91sam9260_initialize(unsigned long main_clock)
 static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
        7,      /* Advanced Interrupt Controller */
        7,      /* System Peripherals */
-        0,      /* Parallel IO Controller A */
+        1,      /* Parallel IO Controller A */
-        0,      /* Parallel IO Controller B */
+        1,      /* Parallel IO Controller B */
-        0,      /* Parallel IO Controller C */
+        1,      /* Parallel IO Controller C */
        0,      /* Analog-to-Digital Converter */
-        6,      /* USART 0 */
+        5,      /* USART 0 */
-        6,      /* USART 1 */
+        5,      /* USART 1 */
-        6,      /* USART 2 */
+        5,      /* USART 2 */
        0,      /* Multimedia Card Interface */
-        4,      /* USB Device Port */
+        2,      /* USB Device Port */
-        0,      /* Two-Wire Interface */
+        6,      /* Two-Wire Interface */
-        6,      /* Serial Peripheral Interface 0 */
+        5,      /* Serial Peripheral Interface 0 */
-        6,      /* Serial Peripheral Interface 1 */
+        5,      /* Serial Peripheral Interface 1 */
        5,      /* Serial Synchronous Controller */
        0,
        0,
        0,      /* Timer Counter 0 */
        0,      /* Timer Counter 1 */
        0,      /* Timer Counter 2 */
-        3,      /* USB Host port */
+        2,      /* USB Host port */
        3,      /* Ethernet */
        0,      /* Image Sensor Interface */
-        6,      /* USART 3 */
+        5,      /* USART 3 */
-        6,      /* USART 4 */
+        5,      /* USART 4 */
-        6,      /* USART 5 */
+        5,      /* USART 5 */
        0,      /* Timer Counter 3 */
        0,      /* Timer Counter 4 */
        0,      /* Timer Counter 5 */
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index dfe8c39c9fb9..90b87e1877d9 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -279,25 +279,25 @@ void __init at91sam9261_initialize(unsigned long main_clock)
 static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
        7,      /* Advanced Interrupt Controller */
        7,      /* System Peripherals */
-        0,      /* Parallel IO Controller A */
+        1,      /* Parallel IO Controller A */
-        0,      /* Parallel IO Controller B */
+        1,      /* Parallel IO Controller B */
-        0,      /* Parallel IO Controller C */
+        1,      /* Parallel IO Controller C */
        0,
-        6,      /* USART 0 */
+        5,      /* USART 0 */
-        6,      /* USART 1 */
+        5,      /* USART 1 */
-        6,      /* USART 2 */
+        5,      /* USART 2 */
        0,      /* Multimedia Card Interface */
-        4,      /* USB Device Port */
+        2,      /* USB Device Port */
-        0,      /* Two-Wire Interface */
+        6,      /* Two-Wire Interface */
-        6,      /* Serial Peripheral Interface 0 */
+        5,      /* Serial Peripheral Interface 0 */
-        6,      /* Serial Peripheral Interface 1 */
+        5,      /* Serial Peripheral Interface 1 */
-        5,      /* Serial Synchronous Controller 0 */
+        4,      /* Serial Synchronous Controller 0 */
-        5,      /* Serial Synchronous Controller 1 */
+        4,      /* Serial Synchronous Controller 1 */
-        5,      /* Serial Synchronous Controller 2 */
+        4,      /* Serial Synchronous Controller 2 */
        0,      /* Timer Counter 0 */
        0,      /* Timer Counter 1 */
        0,      /* Timer Counter 2 */
-        3,      /* USB Host port */
+        2,      /* USB Host port */
        3,      /* LCD Controller */
        0,
        0,
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 00e27b177857..a53ba0f74351 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -304,34 +304,34 @@ void __init at91sam9263_initialize(unsigned long main_clock)
 static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
        7,      /* Advanced Interrupt Controller (FIQ) */
        7,      /* System Peripherals */
-        0,      /* Parallel IO Controller A */
+        1,      /* Parallel IO Controller A */
-        0,      /* Parallel IO Controller B */
+        1,      /* Parallel IO Controller B */
-        0,      /* Parallel IO Controller C, D and E */
+        1,      /* Parallel IO Controller C, D and E */
        0,
        0,
-        6,      /* USART 0 */
+        5,      /* USART 0 */
-        6,      /* USART 1 */
+        5,      /* USART 1 */
-        6,      /* USART 2 */
+        5,      /* USART 2 */
        0,      /* Multimedia Card Interface 0 */
        0,      /* Multimedia Card Interface 1 */
-        4,      /* CAN */
+        3,      /* CAN */
-        0,      /* Two-Wire Interface */
+        6,      /* Two-Wire Interface */
-        6,      /* Serial Peripheral Interface 0 */
+        5,      /* Serial Peripheral Interface 0 */
-        6,      /* Serial Peripheral Interface 1 */
+        5,      /* Serial Peripheral Interface 1 */
-        5,      /* Serial Synchronous Controller 0 */
+        4,      /* Serial Synchronous Controller 0 */
-        5,      /* Serial Synchronous Controller 1 */
+        4,      /* Serial Synchronous Controller 1 */
-        6,      /* AC97 Controller */
+        5,      /* AC97 Controller */
        0,      /* Timer Counter 0, 1 and 2 */
        0,      /* Pulse Width Modulation Controller */
        3,      /* Ethernet */
        0,
        0,      /* 2D Graphic Engine */
-        3,      /* USB Device Port */
+        2,      /* USB Device Port */
        0,      /* Image Sensor Interface */
        3,      /* LDC Controller */
        0,      /* DMA Controller */
        0,
-        3,      /* USB Host port */
+        2,      /* USB Host port */
        0,      /* Advanced Interrupt Controller (IRQ0) */
        0,      /* Advanced Interrupt Controller (IRQ1) */
 };

diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 2cad2bf864be..d688c1dbd925 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c
@@ -301,28 +301,28 @@ void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks
301	static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {	301	static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
302	7, /* Advanced Interrupt Controller (FIQ) */	302	7, /* Advanced Interrupt Controller (FIQ) */
303	7, /* System Peripherals */	303	7, /* System Peripherals */
304	0, /* Parallel IO Controller A */	304	1, /* Parallel IO Controller A */
305	0, /* Parallel IO Controller B */	305	1, /* Parallel IO Controller B */
306	0, /* Parallel IO Controller C */	306	1, /* Parallel IO Controller C */
307	0, /* Parallel IO Controller D */	307	1, /* Parallel IO Controller D */
308	6, /* USART 0 */	308	5, /* USART 0 */
309	6, /* USART 1 */	309	5, /* USART 1 */
310	6, /* USART 2 */	310	5, /* USART 2 */
311	6, /* USART 3 */	311	5, /* USART 3 */
312	0, /* Multimedia Card Interface */	312	0, /* Multimedia Card Interface */
313	4, /* USB Device Port */	313	2, /* USB Device Port */
314	0, /* Two-Wire Interface */	314	6, /* Two-Wire Interface */
315	6, /* Serial Peripheral Interface */	315	5, /* Serial Peripheral Interface */
316	5, /* Serial Synchronous Controller 0 */	316	4, /* Serial Synchronous Controller 0 */
317	5, /* Serial Synchronous Controller 1 */	317	4, /* Serial Synchronous Controller 1 */
318	5, /* Serial Synchronous Controller 2 */	318	4, /* Serial Synchronous Controller 2 */
319	0, /* Timer Counter 0 */	319	0, /* Timer Counter 0 */
320	0, /* Timer Counter 1 */	320	0, /* Timer Counter 1 */
321	0, /* Timer Counter 2 */	321	0, /* Timer Counter 2 */
322	0, /* Timer Counter 3 */	322	0, /* Timer Counter 3 */
323	0, /* Timer Counter 4 */	323	0, /* Timer Counter 4 */
324	0, /* Timer Counter 5 */	324	0, /* Timer Counter 5 */
325	3, /* USB Host port */	325	2, /* USB Host port */
326	3, /* Ethernet MAC */	326	3, /* Ethernet MAC */
327	0, /* Advanced Interrupt Controller (IRQ0) */	327	0, /* Advanced Interrupt Controller (IRQ0) */
328	0, /* Advanced Interrupt Controller (IRQ1) */	328	0, /* Advanced Interrupt Controller (IRQ1) */


diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index e47381e8aaba..18d06612ce8a 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c
@@ -327,30 +327,30 @@ void __init at91sam9260_initialize(unsigned long main_clock)
327	static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {	327	static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
328	7, /* Advanced Interrupt Controller */	328	7, /* Advanced Interrupt Controller */
329	7, /* System Peripherals */	329	7, /* System Peripherals */
330	0, /* Parallel IO Controller A */	330	1, /* Parallel IO Controller A */
331	0, /* Parallel IO Controller B */	331	1, /* Parallel IO Controller B */
332	0, /* Parallel IO Controller C */	332	1, /* Parallel IO Controller C */
333	0, /* Analog-to-Digital Converter */	333	0, /* Analog-to-Digital Converter */
334	6, /* USART 0 */	334	5, /* USART 0 */
335	6, /* USART 1 */	335	5, /* USART 1 */
336	6, /* USART 2 */	336	5, /* USART 2 */
337	0, /* Multimedia Card Interface */	337	0, /* Multimedia Card Interface */
338	4, /* USB Device Port */	338	2, /* USB Device Port */
339	0, /* Two-Wire Interface */	339	6, /* Two-Wire Interface */
340	6, /* Serial Peripheral Interface 0 */	340	5, /* Serial Peripheral Interface 0 */
341	6, /* Serial Peripheral Interface 1 */	341	5, /* Serial Peripheral Interface 1 */
342	5, /* Serial Synchronous Controller */	342	5, /* Serial Synchronous Controller */
343	0,	343	0,
344	0,	344	0,
345	0, /* Timer Counter 0 */	345	0, /* Timer Counter 0 */
346	0, /* Timer Counter 1 */	346	0, /* Timer Counter 1 */
347	0, /* Timer Counter 2 */	347	0, /* Timer Counter 2 */
348	3, /* USB Host port */	348	2, /* USB Host port */
349	3, /* Ethernet */	349	3, /* Ethernet */
350	0, /* Image Sensor Interface */	350	0, /* Image Sensor Interface */
351	6, /* USART 3 */	351	5, /* USART 3 */
352	6, /* USART 4 */	352	5, /* USART 4 */
353	6, /* USART 5 */	353	5, /* USART 5 */
354	0, /* Timer Counter 3 */	354	0, /* Timer Counter 3 */
355	0, /* Timer Counter 4 */	355	0, /* Timer Counter 4 */
356	0, /* Timer Counter 5 */	356	0, /* Timer Counter 5 */


diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index dfe8c39c9fb9..90b87e1877d9 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c
@@ -279,25 +279,25 @@ void __init at91sam9261_initialize(unsigned long main_clock)
279	static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {	279	static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
280	7, /* Advanced Interrupt Controller */	280	7, /* Advanced Interrupt Controller */
281	7, /* System Peripherals */	281	7, /* System Peripherals */
282	0, /* Parallel IO Controller A */	282	1, /* Parallel IO Controller A */
283	0, /* Parallel IO Controller B */	283	1, /* Parallel IO Controller B */
284	0, /* Parallel IO Controller C */	284	1, /* Parallel IO Controller C */
285	0,	285	0,
286	6, /* USART 0 */	286	5, /* USART 0 */
287	6, /* USART 1 */	287	5, /* USART 1 */
288	6, /* USART 2 */	288	5, /* USART 2 */
289	0, /* Multimedia Card Interface */	289	0, /* Multimedia Card Interface */
290	4, /* USB Device Port */	290	2, /* USB Device Port */
291	0, /* Two-Wire Interface */	291	6, /* Two-Wire Interface */
292	6, /* Serial Peripheral Interface 0 */	292	5, /* Serial Peripheral Interface 0 */
293	6, /* Serial Peripheral Interface 1 */	293	5, /* Serial Peripheral Interface 1 */
294	5, /* Serial Synchronous Controller 0 */	294	4, /* Serial Synchronous Controller 0 */
295	5, /* Serial Synchronous Controller 1 */	295	4, /* Serial Synchronous Controller 1 */
296	5, /* Serial Synchronous Controller 2 */	296	4, /* Serial Synchronous Controller 2 */
297	0, /* Timer Counter 0 */	297	0, /* Timer Counter 0 */
298	0, /* Timer Counter 1 */	298	0, /* Timer Counter 1 */
299	0, /* Timer Counter 2 */	299	0, /* Timer Counter 2 */
300	3, /* USB Host port */	300	2, /* USB Host port */
301	3, /* LCD Controller */	301	3, /* LCD Controller */
302	0,	302	0,
303	0,	303	0,


diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 00e27b177857..a53ba0f74351 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c
@@ -304,34 +304,34 @@ void __init at91sam9263_initialize(unsigned long main_clock)
304	static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {	304	static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
305	7, /* Advanced Interrupt Controller (FIQ) */	305	7, /* Advanced Interrupt Controller (FIQ) */
306	7, /* System Peripherals */	306	7, /* System Peripherals */
307	0, /* Parallel IO Controller A */	307	1, /* Parallel IO Controller A */
308	0, /* Parallel IO Controller B */	308	1, /* Parallel IO Controller B */
309	0, /* Parallel IO Controller C, D and E */	309	1, /* Parallel IO Controller C, D and E */
310	0,	310	0,
311	0,	311	0,
312	6, /* USART 0 */	312	5, /* USART 0 */
313	6, /* USART 1 */	313	5, /* USART 1 */
314	6, /* USART 2 */	314	5, /* USART 2 */
315	0, /* Multimedia Card Interface 0 */	315	0, /* Multimedia Card Interface 0 */
316	0, /* Multimedia Card Interface 1 */	316	0, /* Multimedia Card Interface 1 */
317	4, /* CAN */	317	3, /* CAN */
318	0, /* Two-Wire Interface */	318	6, /* Two-Wire Interface */
319	6, /* Serial Peripheral Interface 0 */	319	5, /* Serial Peripheral Interface 0 */
320	6, /* Serial Peripheral Interface 1 */	320	5, /* Serial Peripheral Interface 1 */
321	5, /* Serial Synchronous Controller 0 */	321	4, /* Serial Synchronous Controller 0 */
322	5, /* Serial Synchronous Controller 1 */	322	4, /* Serial Synchronous Controller 1 */
323	6, /* AC97 Controller */	323	5, /* AC97 Controller */
324	0, /* Timer Counter 0, 1 and 2 */	324	0, /* Timer Counter 0, 1 and 2 */
325	0, /* Pulse Width Modulation Controller */	325	0, /* Pulse Width Modulation Controller */
326	3, /* Ethernet */	326	3, /* Ethernet */
327	0,	327	0,
328	0, /* 2D Graphic Engine */	328	0, /* 2D Graphic Engine */
329	3, /* USB Device Port */	329	2, /* USB Device Port */
330	0, /* Image Sensor Interface */	330	0, /* Image Sensor Interface */
331	3, /* LDC Controller */	331	3, /* LDC Controller */
332	0, /* DMA Controller */	332	0, /* DMA Controller */
333	0,	333	0,
334	3, /* USB Host port */	334	2, /* USB Host port */
335	0, /* Advanced Interrupt Controller (IRQ0) */	335	0, /* Advanced Interrupt Controller (IRQ0) */
336	0, /* Advanced Interrupt Controller (IRQ1) */	336	0, /* Advanced Interrupt Controller (IRQ1) */
337	};	337	};