diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-06-20 17:27:10 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-06-20 17:27:10 -0400 |
| commit | 3b1d4ed5353af04d6aa20be2701727b9cdb2ac61 (patch) | |
| tree | e4a3335c925abd933f1650e1ee4786e6bfad8f35 /include/asm-mips/mips-boards | |
| parent | 7c8545e98468c53809fc06788a3b9a34dff05240 (diff) | |
[MIPS] Don't drag a platform specific header into generic arch code.
For some platforms it's definitions may conflict. So that's the one-liner.
The rest is 10 square kilometers of collateral damage fixup this include
used to paper over.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/mips-boards')
| -rw-r--r-- | include/asm-mips/mips-boards/atlasint.h | 6 | ||||
| -rw-r--r-- | include/asm-mips/mips-boards/maltaint.h | 6 | ||||
| -rw-r--r-- | include/asm-mips/mips-boards/seadint.h | 7 | ||||
| -rw-r--r-- | include/asm-mips/mips-boards/simint.h | 4 |
4 files changed, 0 insertions, 23 deletions
diff --git a/include/asm-mips/mips-boards/atlasint.h b/include/asm-mips/mips-boards/atlasint.h index 76add42e48..93ba1c1b2a 100644 --- a/include/asm-mips/mips-boards/atlasint.h +++ b/include/asm-mips/mips-boards/atlasint.h | |||
| @@ -28,11 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #include <irq.h> | 29 | #include <irq.h> |
| 30 | 30 | ||
| 31 | /* | ||
| 32 | * Interrupts 0..7 are used for Atlas CPU interrupts (nonEIC mode) | ||
| 33 | */ | ||
| 34 | #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE | ||
| 35 | |||
| 36 | /* CPU interrupt offsets */ | 31 | /* CPU interrupt offsets */ |
| 37 | #define MIPSCPU_INT_SW0 0 | 32 | #define MIPSCPU_INT_SW0 0 |
| 38 | #define MIPSCPU_INT_SW1 1 | 33 | #define MIPSCPU_INT_SW1 1 |
| @@ -42,7 +37,6 @@ | |||
| 42 | #define MIPSCPU_INT_MB2 4 | 37 | #define MIPSCPU_INT_MB2 4 |
| 43 | #define MIPSCPU_INT_MB3 5 | 38 | #define MIPSCPU_INT_MB3 5 |
| 44 | #define MIPSCPU_INT_MB4 6 | 39 | #define MIPSCPU_INT_MB4 6 |
| 45 | #define MIPSCPU_INT_CPUCTR 7 | ||
| 46 | 40 | ||
| 47 | /* | 41 | /* |
| 48 | * Interrupts 8..39 are used for Atlas interrupt controller interrupts | 42 | * Interrupts 8..39 are used for Atlas interrupt controller interrupts |
diff --git a/include/asm-mips/mips-boards/maltaint.h b/include/asm-mips/mips-boards/maltaint.h index 9180d64661..7461318f1c 100644 --- a/include/asm-mips/mips-boards/maltaint.h +++ b/include/asm-mips/mips-boards/maltaint.h | |||
| @@ -32,11 +32,6 @@ | |||
| 32 | */ | 32 | */ |
| 33 | #define MALTA_INT_BASE 0 | 33 | #define MALTA_INT_BASE 0 |
| 34 | 34 | ||
| 35 | /* | ||
| 36 | * Interrupts 16..23 are used for Malta CPU interrupts (nonEIC mode) | ||
| 37 | */ | ||
| 38 | #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE | ||
| 39 | |||
| 40 | /* CPU interrupt offsets */ | 35 | /* CPU interrupt offsets */ |
| 41 | #define MIPSCPU_INT_SW0 0 | 36 | #define MIPSCPU_INT_SW0 0 |
| 42 | #define MIPSCPU_INT_SW1 1 | 37 | #define MIPSCPU_INT_SW1 1 |
| @@ -49,7 +44,6 @@ | |||
| 49 | #define MIPSCPU_INT_COREHI MIPSCPU_INT_MB3 | 44 | #define MIPSCPU_INT_COREHI MIPSCPU_INT_MB3 |
| 50 | #define MIPSCPU_INT_MB4 6 | 45 | #define MIPSCPU_INT_MB4 6 |
| 51 | #define MIPSCPU_INT_CORELO MIPSCPU_INT_MB4 | 46 | #define MIPSCPU_INT_CORELO MIPSCPU_INT_MB4 |
| 52 | #define MIPSCPU_INT_CPUCTR 7 | ||
| 53 | 47 | ||
| 54 | /* | 48 | /* |
| 55 | * Interrupts 64..127 are used for Soc-it Classic interrupts | 49 | * Interrupts 64..127 are used for Soc-it Classic interrupts |
diff --git a/include/asm-mips/mips-boards/seadint.h b/include/asm-mips/mips-boards/seadint.h index 4f6a393369..e710bae073 100644 --- a/include/asm-mips/mips-boards/seadint.h +++ b/include/asm-mips/mips-boards/seadint.h | |||
| @@ -22,14 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <irq.h> | 23 | #include <irq.h> |
| 24 | 24 | ||
| 25 | /* | ||
| 26 | * Interrupts 0..7 are used for SEAD CPU interrupts | ||
| 27 | */ | ||
| 28 | #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE | ||
| 29 | |||
| 30 | #define MIPSCPU_INT_UART0 2 | 25 | #define MIPSCPU_INT_UART0 2 |
| 31 | #define MIPSCPU_INT_UART1 3 | 26 | #define MIPSCPU_INT_UART1 3 |
| 32 | 27 | ||
| 33 | #define MIPSCPU_INT_CPUCTR 7 | ||
| 34 | |||
| 35 | #endif /* !(_MIPS_SEADINT_H) */ | 28 | #endif /* !(_MIPS_SEADINT_H) */ |
diff --git a/include/asm-mips/mips-boards/simint.h b/include/asm-mips/mips-boards/simint.h index 54f2fe621d..8ef6db76d5 100644 --- a/include/asm-mips/mips-boards/simint.h +++ b/include/asm-mips/mips-boards/simint.h | |||
| @@ -21,15 +21,11 @@ | |||
| 21 | 21 | ||
| 22 | #define SIM_INT_BASE 0 | 22 | #define SIM_INT_BASE 0 |
| 23 | #define MIPSCPU_INT_MB0 2 | 23 | #define MIPSCPU_INT_MB0 2 |
| 24 | #define MIPSCPU_INT_BASE MIPS_CPU_IRQ_BASE | ||
| 25 | #define MIPS_CPU_TIMER_IRQ 7 | 24 | #define MIPS_CPU_TIMER_IRQ 7 |
| 26 | 25 | ||
| 27 | 26 | ||
| 28 | #define MIPSCPU_INT_CPUCTR 7 | ||
| 29 | |||
| 30 | #define MSC01E_INT_BASE 64 | 27 | #define MSC01E_INT_BASE 64 |
| 31 | 28 | ||
| 32 | #define MIPSCPU_INT_CPUCTR 7 | ||
| 33 | #define MSC01E_INT_CPUCTR 11 | 29 | #define MSC01E_INT_CPUCTR 11 |
| 34 | 30 | ||
| 35 | #endif | 31 | #endif |
