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

   1 --- a/arch/mips/include/asm/cpu.h
   2 +++ b/arch/mips/include/asm/cpu.h
   3 @@ -111,7 +111,7 @@
   4   * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
   5   */
   6
   7 -#define PRID_IMP_BMIPS4KC      0x4000
   8 +#define PRID_IMP_BCM4710       0x4000
   9  #define PRID_IMP_BMIPS32       0x8000
  10  #define PRID_IMP_BMIPS3300     0x9000
  11  #define PRID_IMP_BMIPS3300_ALT 0x9100
  12 @@ -226,8 +226,8 @@ enum cpu_type_enum {
  13          * MIPS32 class processors
  14          */
  15         CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
  16 -       CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350,
  17 -       CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC,
  18 +       CPU_ALCHEMY, CPU_PR4450, CPU_BCM4710, CPU_BMIPS32, CPU_BMIPS3300,
  19 +       CPU_BMIPS4350, CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC,
  20
  21         /*
  22          * MIPS64 class processors
  23 --- a/arch/mips/kernel/cpu-probe.c
  24 +++ b/arch/mips/kernel/cpu-probe.c
  25 @@ -933,9 +933,9 @@ static inline void cpu_probe_broadcom(st
  26                 __cpu_name[cpu] = "Broadcom BMIPS5000";
  27                 c->options |= MIPS_CPU_ULRI;
  28                 break;
  29 -       case PRID_IMP_BMIPS4KC:
  30 -               c->cputype = CPU_4KC;
  31 -               __cpu_name[cpu] = "MIPS 4Kc";
  32 +       case PRID_IMP_BCM4710:
  33 +               c->cputype = CPU_BCM4710;
  34 +               __cpu_name[cpu] = "Broadcom BCM4710";
  35                 break;
  36         }
  37  }
  38 --- a/arch/mips/mm/tlbex.c
  39 +++ b/arch/mips/mm/tlbex.c
  40 @@ -338,6 +338,7 @@ static void __cpuinit build_tlb_write_en
  41         case CPU_4KSC:
  42         case CPU_20KC:
  43         case CPU_25KF:
  44 +       case CPU_BCM4710:
  45         case CPU_BMIPS32:
  46         case CPU_BMIPS3300:
  47         case CPU_BMIPS4350: