diff options
| author | Leonid Yegoshin <[email protected]> | 2013-06-20 14:36:42 +0000 |
|---|---|---|
| committer | Ralf Baechle <[email protected]> | 2013-07-01 15:10:58 +0200 |
| commit | 78276207a70e805cc022364218eefb8aa05ea647 (patch) | |
| tree | 78402ce0bac21f60018cb53286d496c866a0db4d | |
| parent | ed3ce16c3d2ba7cac321d29ec0a7d21408ea8437 (diff) | |
MIPS: Malta: Update GCMP detection.
Add GCMP detection for IASim Marvell chip emulation support.
Signed-off-by: Leonid Yegoshin <[email protected]>
Acked-by: Steven J. Hill <[email protected]>
Cc: [email protected]
Cc: Leonid Yegoshin <[email protected]>
Patchwork: https://patchwork.linux-mips.org/patch/5529/
Signed-off-by: Ralf Baechle <[email protected]>
| -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] = { */ int __init gcmp_probe(unsigned long addr, unsigned long size) { - if (mips_revision_sconid != MIPS_REVISION_SCON_ROCIT) { + if ((mips_revision_sconid != MIPS_REVISION_SCON_ROCIT) && + (mips_revision_sconid != MIPS_REVISION_SCON_GT64120)) { gcmp_present = 0; + pr_debug("GCMP NOT present\n"); return gcmp_present; } |