target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch

   1 From 1ff5904f725e9816b5ff2b5ade1d6326558d8e01 Mon Sep 17 00:00:00 2001
   2 From: Kevin Cernekee <cernekee@gmail.com>
   3 To: Ralf Baechle <ralf@linux-mips.org>
   4 Cc: <linux-mips@linux-mips.org>, <linux-kernel@vger.kernel.org>
   5 Date: Mon, 22 Nov 2010 21:41:28 -0800
   6 Subject: [PATCH 7/7] MIPS: Fix regression on BCM4710 processor detection
   7
   8 BCM4710 uses the BMIPS32 core (like BCM6345), not the MIPS 4Kc core as
   9 was previously believed.
  10
  11 Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
  12 ---
  13  arch/mips/include/asm/cpu.h  |    4 ++--
  14  arch/mips/kernel/cpu-probe.c |    7 ++-----
  15  2 files changed, 4 insertions(+), 7 deletions(-)
  16
  17 --- a/arch/mips/include/asm/cpu.h
  18 +++ b/arch/mips/include/asm/cpu.h
  19 @@ -111,8 +111,8 @@
  20   * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
  21   */
  22
  23 -#define PRID_IMP_BMIPS4KC      0x4000
  24 -#define PRID_IMP_BMIPS32       0x8000
  25 +#define PRID_IMP_BMIPS32_REV4  0x4000
  26 +#define PRID_IMP_BMIPS32_REV8  0x8000
  27  #define PRID_IMP_BMIPS3300     0x9000
  28  #define PRID_IMP_BMIPS3300_ALT 0x9100
  29  #define PRID_IMP_BMIPS3300_BUG 0x0000
  30 --- a/arch/mips/kernel/cpu-probe.c
  31 +++ b/arch/mips/kernel/cpu-probe.c
  32 @@ -905,7 +905,8 @@ static inline void cpu_probe_broadcom(st
  33  {
  34         decode_configs(c);
  35         switch (c->processor_id & 0xff00) {
  36 -       case PRID_IMP_BMIPS32:
  37 +       case PRID_IMP_BMIPS32_REV4:
  38 +       case PRID_IMP_BMIPS32_REV8:
  39                 c->cputype = CPU_BMIPS32;
  40                 __cpu_name[cpu] = "Broadcom BMIPS32";
  41                 break;
  42 @@ -933,10 +934,6 @@ static inline void cpu_probe_broadcom(st
  43                 __cpu_name[cpu] = "Broadcom BMIPS5000";
  44                 c->options |= MIPS_CPU_ULRI;
  45                 break;
  46 -       case PRID_IMP_BMIPS4KC:
  47 -               c->cputype = CPU_4KC;
  48 -               __cpu_name[cpu] = "MIPS 4Kc";
  49 -               break;
  50         }
  51  }
  52