diff options
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at572d940hf.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91cap9.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91rm9200.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9260.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9261.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9263.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9rl.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91x40.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h | 6 |
10 files changed, 6 insertions, 18 deletions
diff --git a/arch/arm/mach-at91/include/mach/at572d940hf.h b/arch/arm/mach-at91/include/mach/at572d940hf.h index be510cfc56be..a738dc7e5d44 100644 --- a/arch/arm/mach-at91/include/mach/at572d940hf.h +++ b/arch/arm/mach-at91/include/mach/at572d940hf.h | |||
| @@ -26,8 +26,6 @@ | |||
| 26 | /* | 26 | /* |
| 27 | * Peripheral identifiers/interrupts. | 27 | * Peripheral identifiers/interrupts. |
| 28 | */ | 28 | */ |
| 29 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 30 | #define AT91_ID_SYS 1 /* System Peripherals */ | ||
| 31 | #define AT572D940HF_ID_PIOA 2 /* Parallel IO Controller A */ | 29 | #define AT572D940HF_ID_PIOA 2 /* Parallel IO Controller A */ |
| 32 | #define AT572D940HF_ID_PIOB 3 /* Parallel IO Controller B */ | 30 | #define AT572D940HF_ID_PIOB 3 /* Parallel IO Controller B */ |
| 33 | #define AT572D940HF_ID_PIOC 4 /* Parallel IO Controller C */ | 31 | #define AT572D940HF_ID_PIOC 4 /* Parallel IO Controller C */ |
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h index 9c6af9737485..a043bce8da97 100644 --- a/arch/arm/mach-at91/include/mach/at91cap9.h +++ b/arch/arm/mach-at91/include/mach/at91cap9.h | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | /* | 20 | /* |
| 21 | * Peripheral identifiers/interrupts. | 21 | * Peripheral identifiers/interrupts. |
| 22 | */ | 22 | */ |
| 23 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 24 | #define AT91_ID_SYS 1 /* System Peripherals */ | ||
| 25 | #define AT91CAP9_ID_PIOABCD 2 /* Parallel IO Controller A, B, C and D */ | 23 | #define AT91CAP9_ID_PIOABCD 2 /* Parallel IO Controller A, B, C and D */ |
| 26 | #define AT91CAP9_ID_MPB0 3 /* MP Block Peripheral 0 */ | 24 | #define AT91CAP9_ID_MPB0 3 /* MP Block Peripheral 0 */ |
| 27 | #define AT91CAP9_ID_MPB1 4 /* MP Block Peripheral 1 */ | 25 | #define AT91CAP9_ID_MPB1 4 /* MP Block Peripheral 1 */ |
diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index 78983155a074..99e0f8d02d7b 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | /* | 19 | /* |
| 20 | * Peripheral identifiers/interrupts. | 20 | * Peripheral identifiers/interrupts. |
| 21 | */ | 21 | */ |
| 22 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 23 | #define AT91_ID_SYS 1 /* System Peripheral */ | ||
| 24 | #define AT91RM9200_ID_PIOA 2 /* Parallel IO Controller A */ | 22 | #define AT91RM9200_ID_PIOA 2 /* Parallel IO Controller A */ |
| 25 | #define AT91RM9200_ID_PIOB 3 /* Parallel IO Controller B */ | 23 | #define AT91RM9200_ID_PIOB 3 /* Parallel IO Controller B */ |
| 26 | #define AT91RM9200_ID_PIOC 4 /* Parallel IO Controller C */ | 24 | #define AT91RM9200_ID_PIOC 4 /* Parallel IO Controller C */ |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h index 4e79036d3b80..8b6bf835cd73 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9260.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260.h | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | /* | 20 | /* |
| 21 | * Peripheral identifiers/interrupts. | 21 | * Peripheral identifiers/interrupts. |
| 22 | */ | 22 | */ |
| 23 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 24 | #define AT91_ID_SYS 1 /* System Peripherals */ | ||
| 25 | #define AT91SAM9260_ID_PIOA 2 /* Parallel IO Controller A */ | 23 | #define AT91SAM9260_ID_PIOA 2 /* Parallel IO Controller A */ |
| 26 | #define AT91SAM9260_ID_PIOB 3 /* Parallel IO Controller B */ | 24 | #define AT91SAM9260_ID_PIOB 3 /* Parallel IO Controller B */ |
| 27 | #define AT91SAM9260_ID_PIOC 4 /* Parallel IO Controller C */ | 25 | #define AT91SAM9260_ID_PIOC 4 /* Parallel IO Controller C */ |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h index 2b5618518129..eafbddaf523c 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9261.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261.h | |||
| @@ -18,8 +18,6 @@ | |||
| 18 | /* | 18 | /* |
| 19 | * Peripheral identifiers/interrupts. | 19 | * Peripheral identifiers/interrupts. |
| 20 | */ | 20 | */ |
| 21 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 22 | #define AT91_ID_SYS 1 /* System Peripherals */ | ||
| 23 | #define AT91SAM9261_ID_PIOA 2 /* Parallel IO Controller A */ | 21 | #define AT91SAM9261_ID_PIOA 2 /* Parallel IO Controller A */ |
| 24 | #define AT91SAM9261_ID_PIOB 3 /* Parallel IO Controller B */ | 22 | #define AT91SAM9261_ID_PIOB 3 /* Parallel IO Controller B */ |
| 25 | #define AT91SAM9261_ID_PIOC 4 /* Parallel IO Controller C */ | 23 | #define AT91SAM9261_ID_PIOC 4 /* Parallel IO Controller C */ |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h index 2091f1e42d43..e2d348213a7b 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9263.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263.h | |||
| @@ -18,8 +18,6 @@ | |||
| 18 | /* | 18 | /* |
| 19 | * Peripheral identifiers/interrupts. | 19 | * Peripheral identifiers/interrupts. |
| 20 | */ | 20 | */ |
| 21 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 22 | #define AT91_ID_SYS 1 /* System Peripherals */ | ||
| 23 | #define AT91SAM9263_ID_PIOA 2 /* Parallel IO Controller A */ | 21 | #define AT91SAM9263_ID_PIOA 2 /* Parallel IO Controller A */ |
| 24 | #define AT91SAM9263_ID_PIOB 3 /* Parallel IO Controller B */ | 22 | #define AT91SAM9263_ID_PIOB 3 /* Parallel IO Controller B */ |
| 25 | #define AT91SAM9263_ID_PIOCDE 4 /* Parallel IO Controller C, D and E */ | 23 | #define AT91SAM9263_ID_PIOCDE 4 /* Parallel IO Controller C, D and E */ |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h index a526869aee37..520b14b9cfe9 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h | |||
| @@ -18,8 +18,6 @@ | |||
| 18 | /* | 18 | /* |
| 19 | * Peripheral identifiers/interrupts. | 19 | * Peripheral identifiers/interrupts. |
| 20 | */ | 20 | */ |
| 21 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 22 | #define AT91_ID_SYS 1 /* System Controller Interrupt */ | ||
| 23 | #define AT91SAM9G45_ID_PIOA 2 /* Parallel I/O Controller A */ | 21 | #define AT91SAM9G45_ID_PIOA 2 /* Parallel I/O Controller A */ |
| 24 | #define AT91SAM9G45_ID_PIOB 3 /* Parallel I/O Controller B */ | 22 | #define AT91SAM9G45_ID_PIOB 3 /* Parallel I/O Controller B */ |
| 25 | #define AT91SAM9G45_ID_PIOC 4 /* Parallel I/O Controller C */ | 23 | #define AT91SAM9G45_ID_PIOC 4 /* Parallel I/O Controller C */ |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h index 87ba8517ad98..41dbbe61055c 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9rl.h +++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | /* | 17 | /* |
| 18 | * Peripheral identifiers/interrupts. | 18 | * Peripheral identifiers/interrupts. |
| 19 | */ | 19 | */ |
| 20 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 21 | #define AT91_ID_SYS 1 /* System Controller */ | ||
| 22 | #define AT91SAM9RL_ID_PIOA 2 /* Parallel IO Controller A */ | 20 | #define AT91SAM9RL_ID_PIOA 2 /* Parallel IO Controller A */ |
| 23 | #define AT91SAM9RL_ID_PIOB 3 /* Parallel IO Controller B */ | 21 | #define AT91SAM9RL_ID_PIOB 3 /* Parallel IO Controller B */ |
| 24 | #define AT91SAM9RL_ID_PIOC 4 /* Parallel IO Controller C */ | 22 | #define AT91SAM9RL_ID_PIOC 4 /* Parallel IO Controller C */ |
diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h index 063ac44a0204..a152ff87e688 100644 --- a/arch/arm/mach-at91/include/mach/at91x40.h +++ b/arch/arm/mach-at91/include/mach/at91x40.h | |||
| @@ -15,8 +15,6 @@ | |||
| 15 | /* | 15 | /* |
| 16 | * IRQ list. | 16 | * IRQ list. |
| 17 | */ | 17 | */ |
| 18 | #define AT91_ID_FIQ 0 /* FIQ */ | ||
| 19 | #define AT91_ID_SYS 1 /* System Peripheral */ | ||
| 20 | #define AT91X40_ID_USART0 2 /* USART port 0 */ | 18 | #define AT91X40_ID_USART0 2 /* USART port 0 */ |
| 21 | #define AT91X40_ID_USART1 3 /* USART port 1 */ | 19 | #define AT91X40_ID_USART1 3 /* USART port 1 */ |
| 22 | #define AT91X40_ID_TC0 4 /* Timer/Counter 0 */ | 20 | #define AT91X40_ID_TC0 4 /* Timer/Counter 0 */ |
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 3d64a75e3ed5..352246407f72 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h | |||
| @@ -39,6 +39,12 @@ | |||
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | /* | ||
| 43 | * Peripheral identifiers/interrupts. | ||
| 44 | */ | ||
| 45 | #define AT91_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ | ||
| 46 | #define AT91_ID_SYS 1 /* System Peripherals */ | ||
| 47 | |||
| 42 | #ifdef CONFIG_MMU | 48 | #ifdef CONFIG_MMU |
| 43 | /* | 49 | /* |
| 44 | * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF | 50 | * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF |
