MIPS: Malta: Update GCMP detection.
authorLeonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Thu, 20 Jun 2013 14:36:42 +0000 (14:36 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 1 Jul 2013 13:10:58 +0000 (15:10 +0200)
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>
arch/mips/mti-malta/malta-int.c

index 0a1339ac3ec8f8e6c3d9be6c4dc3b272d7044f98..c69da37346995e94a5e5d4a33dafce0585b84ed9 100644 (file)
@@ -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;
        }