diff options
author | Chris Dearman <chris@mips.com> | 2006-04-14 19:31:16 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-04-27 10:13:50 -0400 |
commit | 7a8341969fe0df4a1fffa141435e742456270ffd (patch) | |
tree | accf4fa15fce1d32c4f57d5acd1a28a3bd49e1f4 | |
parent | 2a2c3e451965aca35c2d0d1b2db1dbd1d839c75e (diff) |
[MIPS] 24K LV: Add core card id.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/mips-boards/generic/init.c | 1 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/pci.c | 1 | ||||
-rw-r--r-- | arch/mips/mips-boards/malta/malta_int.c | 3 | ||||
-rw-r--r-- | include/asm-mips/mips-boards/generic.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index 17dfe6a8cab9..df4e94735604 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
@@ -337,6 +337,7 @@ void __init prom_init(void) | |||
337 | case MIPS_REVISION_CORID_CORE_MSC: | 337 | case MIPS_REVISION_CORID_CORE_MSC: |
338 | case MIPS_REVISION_CORID_CORE_FPGA2: | 338 | case MIPS_REVISION_CORID_CORE_FPGA2: |
339 | case MIPS_REVISION_CORID_CORE_FPGA3: | 339 | case MIPS_REVISION_CORID_CORE_FPGA3: |
340 | case MIPS_REVISION_CORID_CORE_24K: | ||
340 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 341 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
341 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); | 342 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); |
342 | 343 | ||
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c index 1f6f9df74ab2..9337f6c8873a 100644 --- a/arch/mips/mips-boards/generic/pci.c +++ b/arch/mips/mips-boards/generic/pci.c | |||
@@ -198,6 +198,7 @@ void __init mips_pcibios_init(void) | |||
198 | case MIPS_REVISION_CORID_CORE_MSC: | 198 | case MIPS_REVISION_CORID_CORE_MSC: |
199 | case MIPS_REVISION_CORID_CORE_FPGA2: | 199 | case MIPS_REVISION_CORID_CORE_FPGA2: |
200 | case MIPS_REVISION_CORID_CORE_FPGA3: | 200 | case MIPS_REVISION_CORID_CORE_FPGA3: |
201 | case MIPS_REVISION_CORID_CORE_24K: | ||
201 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 202 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
202 | /* Set up resource ranges from the controller's registers. */ | 203 | /* Set up resource ranges from the controller's registers. */ |
203 | MSC_READ(MSC01_PCI_SC2PMBASL, start); | 204 | MSC_READ(MSC01_PCI_SC2PMBASL, start); |
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index 64db07d4dbe5..7cc0ba4f553a 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c | |||
@@ -57,6 +57,7 @@ static inline int mips_pcibios_iack(void) | |||
57 | case MIPS_REVISION_CORID_CORE_MSC: | 57 | case MIPS_REVISION_CORID_CORE_MSC: |
58 | case MIPS_REVISION_CORID_CORE_FPGA2: | 58 | case MIPS_REVISION_CORID_CORE_FPGA2: |
59 | case MIPS_REVISION_CORID_CORE_FPGA3: | 59 | case MIPS_REVISION_CORID_CORE_FPGA3: |
60 | case MIPS_REVISION_CORID_CORE_24K: | ||
60 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 61 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
61 | MSC_READ(MSC01_PCI_IACK, irq); | 62 | MSC_READ(MSC01_PCI_IACK, irq); |
62 | irq &= 0xff; | 63 | irq &= 0xff; |
@@ -143,6 +144,7 @@ void corehi_irqdispatch(struct pt_regs *regs) | |||
143 | case MIPS_REVISION_CORID_CORE_MSC: | 144 | case MIPS_REVISION_CORID_CORE_MSC: |
144 | case MIPS_REVISION_CORID_CORE_FPGA2: | 145 | case MIPS_REVISION_CORID_CORE_FPGA2: |
145 | case MIPS_REVISION_CORID_CORE_FPGA3: | 146 | case MIPS_REVISION_CORID_CORE_FPGA3: |
147 | case MIPS_REVISION_CORID_CORE_24K: | ||
146 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 148 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
147 | ll_msc_irq(regs); | 149 | ll_msc_irq(regs); |
148 | break; | 150 | break; |
@@ -309,6 +311,7 @@ void __init arch_init_irq(void) | |||
309 | case MIPS_REVISION_CORID_CORE_MSC: | 311 | case MIPS_REVISION_CORID_CORE_MSC: |
310 | case MIPS_REVISION_CORID_CORE_FPGA2: | 312 | case MIPS_REVISION_CORID_CORE_FPGA2: |
311 | case MIPS_REVISION_CORID_CORE_FPGA3: | 313 | case MIPS_REVISION_CORID_CORE_FPGA3: |
314 | case MIPS_REVISION_CORID_CORE_24K: | ||
312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 315 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
313 | if (cpu_has_veic) | 316 | if (cpu_has_veic) |
314 | init_msc_irqs (MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 317 | init_msc_irqs (MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); |
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h index 25b6ffc26623..fa8b913cc3e0 100644 --- a/include/asm-mips/mips-boards/generic.h +++ b/include/asm-mips/mips-boards/generic.h | |||
@@ -67,6 +67,7 @@ | |||
67 | #define MIPS_REVISION_CORID_CORE_FPGA2 7 | 67 | #define MIPS_REVISION_CORID_CORE_FPGA2 7 |
68 | #define MIPS_REVISION_CORID_CORE_FPGAR2 8 | 68 | #define MIPS_REVISION_CORID_CORE_FPGAR2 8 |
69 | #define MIPS_REVISION_CORID_CORE_FPGA3 9 | 69 | #define MIPS_REVISION_CORID_CORE_FPGA3 9 |
70 | #define MIPS_REVISION_CORID_CORE_24K 10 | ||
70 | 71 | ||
71 | /**** Artificial corid defines ****/ | 72 | /**** Artificial corid defines ****/ |
72 | /* | 73 | /* |