diff options
author | Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> | 2013-06-20 10:36:42 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-01 09:10:58 -0400 |
commit | 78276207a70e805cc022364218eefb8aa05ea647 (patch) | |
tree | 78402ce0bac21f60018cb53286d496c866a0db4d /arch/mips/mti-malta | |
parent | ed3ce16c3d2ba7cac321d29ec0a7d21408ea8437 (diff) |
MIPS: Malta: Update GCMP detection.
Add GCMP detection for IASim Marvell chip emulation support.
Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/5529/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mti-malta')
-rw-r--r-- | arch/mips/mti-malta/malta-int.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c index 0a1339ac3ec8..c69da3734699 100644 --- a/arch/mips/mti-malta/malta-int.c +++ b/arch/mips/mti-malta/malta-int.c | |||
@@ -422,8 +422,10 @@ static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = { | |||
422 | */ | 422 | */ |
423 | int __init gcmp_probe(unsigned long addr, unsigned long size) | 423 | int __init gcmp_probe(unsigned long addr, unsigned long size) |
424 | { | 424 | { |
425 | if (mips_revision_sconid != MIPS_REVISION_SCON_ROCIT) { | 425 | if ((mips_revision_sconid != MIPS_REVISION_SCON_ROCIT) && |
426 | (mips_revision_sconid != MIPS_REVISION_SCON_GT64120)) { | ||
426 | gcmp_present = 0; | 427 | gcmp_present = 0; |
428 | pr_debug("GCMP NOT present\n"); | ||
427 | return gcmp_present; | 429 | return gcmp_present; |
428 | } | 430 | } |
429 | 431 | ||