From 0419957c6f58b546dc69c97299b81dfccb14ddd4 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Tue, 4 Jul 2006 22:59:41 +0900
Subject: [PATCH] --- yaml --- r: 32575 b: refs/heads/master c:
 4e8ab3618273b8c5f87a46f82902fbd4138f97f4 h: refs/heads/master i:   32573:
 5fe3d1684830d5d7d4f037074942c93624157dbb   32571:
 45b33d06cbe5f27e09296a327642d1c00fa4e7d2   32567:
 32ff0e8875b8ad81f0c9ae3daa49bc70a2fded55   32559:
 5090d6683d004fb8e5c65ad8f6040339c43eda54   32543:
 c099468fe15044d9d20f40e6db3baf2b36044ef1   32511:
 fc2e117609064a0ccb2760b5fc4c1cab56259623 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/mips/mm/c-r4k.c        | 4 +++-
 trunk/include/asm-mips/mipsregs.h | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cdc093151c3a..1290c6451205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f72af3cf06370cedbe387364d447223e5252a000
+refs/heads/master: 4e8ab3618273b8c5f87a46f82902fbd4138f97f4
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
index ed35ee57b388..256b6611e718 100644
--- a/trunk/arch/mips/mm/c-r4k.c
+++ b/trunk/arch/mips/mm/c-r4k.c
@@ -868,7 +868,9 @@ static void __init probe_pcache(void)
 		if (c->processor_id == 0x0c80U || c->processor_id == 0x0c81U ||
 		    c->processor_id == 0x0c82U) {
 			config &= ~0x00000030U;
-			config |= 0x00410000U;
+			config |= 0x00400000U;
+			if (c->processor_id == 0x0c80U)
+				config |= VR41_CONF_BP;
 			write_c0_config(config);
 		}
 		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));
diff --git a/trunk/include/asm-mips/mipsregs.h b/trunk/include/asm-mips/mipsregs.h
index 9192d76c133d..b4169f0fb13b 100644
--- a/trunk/include/asm-mips/mipsregs.h
+++ b/trunk/include/asm-mips/mipsregs.h
@@ -470,6 +470,7 @@
 
 /* Bits specific to the VR41xx.  */
 #define VR41_CONF_CS		(_ULCAST_(1) << 12)
+#define VR41_CONF_BP		(_ULCAST_(1) << 16)
 #define VR41_CONF_M16		(_ULCAST_(1) << 20)
 #define VR41_CONF_AD		(_ULCAST_(1) << 23)