aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mm
diff options
context:
space:
mode:
authorKumba <kumba@gentoo.org>2006-05-16 22:23:59 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-05-31 19:28:35 -0400
commit44d921b246923380f26b8010e47ac5dfe48fcec5 (patch)
treea7fb7476fbfc8a6564881d7e7e4ce7e5473d0224 /arch/mips/mm
parent714bfad60f3a127147aba76e9c57860c26b1450d (diff)
[MIPS] Treat R14000 like R10000.
Signed-off-by: Joshua Kinard <kumba@gentoo.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm')
-rw-r--r--arch/mips/mm/c-r4k.c4
-rw-r--r--arch/mips/mm/pg-r4k.c1
-rw-r--r--arch/mips/mm/tlbex.c1
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 570bc4e30fd5..6b3541769602 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -335,6 +335,7 @@ static inline void local_r4k___flush_cache_all(void * args)
335 case CPU_R4400MC: 335 case CPU_R4400MC:
336 case CPU_R10000: 336 case CPU_R10000:
337 case CPU_R12000: 337 case CPU_R12000:
338 case CPU_R14000:
338 r4k_blast_scache(); 339 r4k_blast_scache();
339 } 340 }
340} 341}
@@ -833,6 +834,7 @@ static void __init probe_pcache(void)
833 834
834 case CPU_R10000: 835 case CPU_R10000:
835 case CPU_R12000: 836 case CPU_R12000:
837 case CPU_R14000:
836 icache_size = 1 << (12 + ((config & R10K_CONF_IC) >> 29)); 838 icache_size = 1 << (12 + ((config & R10K_CONF_IC) >> 29));
837 c->icache.linesz = 64; 839 c->icache.linesz = 64;
838 c->icache.ways = 2; 840 c->icache.ways = 2;
@@ -986,6 +988,7 @@ static void __init probe_pcache(void)
986 c->dcache.flags |= MIPS_CACHE_PINDEX; 988 c->dcache.flags |= MIPS_CACHE_PINDEX;
987 case CPU_R10000: 989 case CPU_R10000:
988 case CPU_R12000: 990 case CPU_R12000:
991 case CPU_R14000:
989 case CPU_SB1: 992 case CPU_SB1:
990 break; 993 break;
991 case CPU_24K: 994 case CPU_24K:
@@ -1113,6 +1116,7 @@ static void __init setup_scache(void)
1113 1116
1114 case CPU_R10000: 1117 case CPU_R10000:
1115 case CPU_R12000: 1118 case CPU_R12000:
1119 case CPU_R14000:
1116 scache_size = 0x80000 << ((config & R10K_CONF_SS) >> 16); 1120 scache_size = 0x80000 << ((config & R10K_CONF_SS) >> 16);
1117 c->scache.linesz = 64 << ((config >> 13) & 1); 1121 c->scache.linesz = 64 << ((config >> 13) & 1);
1118 c->scache.ways = 2; 1122 c->scache.ways = 2;
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c
index e4390dc3eb48..b7c749232ffe 100644
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
@@ -357,6 +357,7 @@ void __init build_clear_page(void)
357 357
358 case CPU_R10000: 358 case CPU_R10000:
359 case CPU_R12000: 359 case CPU_R12000:
360 case CPU_R14000:
360 pref_src_mode = Pref_LoadStreamed; 361 pref_src_mode = Pref_LoadStreamed;
361 pref_dst_mode = Pref_StoreStreamed; 362 pref_dst_mode = Pref_StoreStreamed;
362 break; 363 break;
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4ff07e2efcb3..54507be2ab5b 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -875,6 +875,7 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
875 875
876 case CPU_R10000: 876 case CPU_R10000:
877 case CPU_R12000: 877 case CPU_R12000:
878 case CPU_R14000:
878 case CPU_4KC: 879 case CPU_4KC:
879 case CPU_SB1: 880 case CPU_SB1:
880 case CPU_SB1A: 881 case CPU_SB1A: