From 16dd69760fdaaa47a3d21ebf5da85504a7870f18 Mon Sep 17 00:00:00 2001
From: "Alexandros C. Couloumbis" <alex@ozo.com>
Date: Tue, 23 Nov 2010 14:12:42 +0000
Subject: [PATCH] linux/brcm47xx: add missing patch on r24112

SVN-Revision: 24113
---
 .../017-MIPS-BCM47xx-bmips4kc_fix.patch       | 57 ++++++++++++-------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch b/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch
index 3b6c797048..08f5f853e8 100644
--- a/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch
@@ -1,34 +1,47 @@
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -934,8 +934,8 @@ static inline void cpu_probe_broadcom(st
- 		c->options |= MIPS_CPU_ULRI;
- 		break;
- 	case PRID_IMP_BMIPS4KC:
--		c->cputype = CPU_4KC;
--		__cpu_name[cpu] = "MIPS 4Kc";
-+		c->cputype = CPU_BMIPS4KC;
-+		__cpu_name[cpu] = "Broadcom BMIPS4Kc";
- 		break;
- 	}
- }
 --- a/arch/mips/include/asm/cpu.h
 +++ b/arch/mips/include/asm/cpu.h
-@@ -227,7 +227,7 @@ enum cpu_type_enum {
+@@ -111,7 +111,7 @@
+  * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
+  */
+ 
+-#define PRID_IMP_BMIPS4KC	0x4000
++#define PRID_IMP_BCM4710	0x4000
+ #define PRID_IMP_BMIPS32	0x8000
+ #define PRID_IMP_BMIPS3300	0x9000
+ #define PRID_IMP_BMIPS3300_ALT	0x9100
+@@ -226,8 +226,8 @@ enum cpu_type_enum {
+ 	 * MIPS32 class processors
  	 */
  	CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
- 	CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350,
+-	CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350,
 -	CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC,
-+	CPU_BMIPS4380, CPU_BMIPS4KC, CPU_BMIPS5000, CPU_JZRISC,
++	CPU_ALCHEMY, CPU_PR4450, CPU_BCM4710, CPU_BMIPS32, CPU_BMIPS3300,
++	CPU_BMIPS4350, CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC,
  
  	/*
  	 * MIPS64 class processors
+--- a/arch/mips/kernel/cpu-probe.c
++++ b/arch/mips/kernel/cpu-probe.c
+@@ -933,9 +933,9 @@ static inline void cpu_probe_broadcom(st
+ 		__cpu_name[cpu] = "Broadcom BMIPS5000";
+ 		c->options |= MIPS_CPU_ULRI;
+ 		break;
+-	case PRID_IMP_BMIPS4KC:
+-		c->cputype = CPU_4KC;
+-		__cpu_name[cpu] = "MIPS 4Kc";
++	case PRID_IMP_BCM4710:
++		c->cputype = CPU_BCM4710;
++		__cpu_name[cpu] = "Broadcom BCM4710";
+ 		break;
+ 	}
+ }
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -342,6 +342,7 @@ static void __cpuinit build_tlb_write_en
+@@ -338,6 +338,7 @@ static void __cpuinit build_tlb_write_en
+ 	case CPU_4KSC:
+ 	case CPU_20KC:
+ 	case CPU_25KF:
++	case CPU_BCM4710:
+ 	case CPU_BMIPS32:
  	case CPU_BMIPS3300:
  	case CPU_BMIPS4350:
- 	case CPU_BMIPS4380:
-+	case CPU_BMIPS4KC:
- 	case CPU_BMIPS5000:
- 	case CPU_LOONGSON2:
- 	case CPU_R5500: