Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next

[firefly-linux-kernel-4.4.55.git] / arch / mips / mti-malta / malta-int.c

diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index 0a1339ac3ec8f8e6c3d9be6c4dc3b272d7044f98..c69da37346995e94a5e5d4a33dafce0585b84ed9 100644 (file)
--- 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;
        }