Merge branch 'master' into sh/smp

[firefly-linux-kernel-4.4.55.git] / arch / sh / kernel / cpu / sh4 / probe.c

diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 695026a3f02d3d12c15a56f853352261ca89486d..d36f0c45f55f3f218956d3dc605eaf02d5cd4e53 100644 (file)
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -144,8 +144,15 @@ int __init detect_cpu_and_cache_system(void)
                }
                break;
        case 0x300b:
-               boot_cpu_data.type = CPU_SH7724;
-               boot_cpu_data.flags |= CPU_HAS_L2_CACHE;
+               switch (prr) {
+               case 0x20:
+                       boot_cpu_data.type = CPU_SH7724;
+                       boot_cpu_data.flags |= CPU_HAS_L2_CACHE;
+                       break;
+               case 0x50:
+                       boot_cpu_data.type = CPU_SH7757;
+                       break;
+               }
                break;
        case 0x4000:    /* 1st cut */
        case 0x4001:    /* 2nd cut */