aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mm
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-12-11 15:02:55 -0500
committerRalf Baechle <ralf@linux-mips.org>2012-12-13 12:15:30 -0500
commitbdf20507da11a9a5b32ef04fa09f352828189aef (patch)
tree5fe9541a1b0dfe9628cd3fff26d6ac43de1206a9 /arch/mips/mm
parentfa4dbbc602a1fb020b627ca8d5a265ad7f3d0c48 (diff)
MIPS: PMC-Sierra Yosemite: Remove support.
Nobody seems to be interested anymore and upstream also never had an ethernet driver. 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/page.c9
-rw-r--r--arch/mips/mm/tlbex.c18
3 files changed, 0 insertions, 31 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 2b6146241bde..d2b5b0c7afa0 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -936,7 +936,6 @@ static void __cpuinit probe_pcache(void)
936 case CPU_RM7000: 936 case CPU_RM7000:
937 rm7k_erratum31(); 937 rm7k_erratum31();
938 938
939 case CPU_RM9000:
940 icache_size = 1 << (12 + ((config & CONF_IC) >> 9)); 939 icache_size = 1 << (12 + ((config & CONF_IC) >> 9));
941 c->icache.linesz = 16 << ((config & CONF_IB) >> 5); 940 c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
942 c->icache.ways = 4; 941 c->icache.ways = 4;
@@ -947,9 +946,7 @@ static void __cpuinit probe_pcache(void)
947 c->dcache.ways = 4; 946 c->dcache.ways = 4;
948 c->dcache.waybit = __ffs(dcache_size / c->dcache.ways); 947 c->dcache.waybit = __ffs(dcache_size / c->dcache.ways);
949 948
950#if !defined(CONFIG_SMP) || !defined(RM9000_CDEX_SMP_WAR)
951 c->options |= MIPS_CPU_CACHE_CDEX_P; 949 c->options |= MIPS_CPU_CACHE_CDEX_P;
952#endif
953 c->options |= MIPS_CPU_PREFETCH; 950 c->options |= MIPS_CPU_PREFETCH;
954 break; 951 break;
955 952
@@ -1234,7 +1231,6 @@ static void __cpuinit setup_scache(void)
1234 return; 1231 return;
1235 1232
1236 case CPU_RM7000: 1233 case CPU_RM7000:
1237 case CPU_RM9000:
1238#ifdef CONFIG_RM7000_CPU_SCACHE 1234#ifdef CONFIG_RM7000_CPU_SCACHE
1239 rm7k_sc_init(); 1235 rm7k_sc_init();
1240#endif 1236#endif
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c
index 98f530e18216..8e666c55f4d4 100644
--- a/arch/mips/mm/page.c
+++ b/arch/mips/mm/page.c
@@ -140,15 +140,6 @@ static void __cpuinit set_prefetch_parameters(void)
140 pref_bias_copy_load = 256; 140 pref_bias_copy_load = 256;
141 break; 141 break;
142 142
143 case CPU_RM9000:
144 /*
145 * As a workaround for erratum G105 which make the
146 * PrepareForStore hint unusable we fall back to
147 * StoreRetained on the RM9000. Once it is known which
148 * versions of the RM9000 we'll be able to condition-
149 * alize this.
150 */
151
152 case CPU_R10000: 143 case CPU_R10000:
153 case CPU_R12000: 144 case CPU_R12000:
154 case CPU_R14000: 145 case CPU_R14000:
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 6af62a2fec21..69a357254e46 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -603,24 +603,6 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
603 tlbw(p); 603 tlbw(p);
604 break; 604 break;
605 605
606 case CPU_RM9000:
607 /*
608 * When the JTLB is updated by tlbwi or tlbwr, a subsequent
609 * use of the JTLB for instructions should not occur for 4
610 * cpu cycles and use for data translations should not occur
611 * for 3 cpu cycles.
612 */
613 uasm_i_ssnop(p);
614 uasm_i_ssnop(p);
615 uasm_i_ssnop(p);
616 uasm_i_ssnop(p);
617 tlbw(p);
618 uasm_i_ssnop(p);
619 uasm_i_ssnop(p);
620 uasm_i_ssnop(p);
621 uasm_i_ssnop(p);
622 break;
623
624 case CPU_VR4111: 606 case CPU_VR4111:
625 case CPU_VR4121: 607 case CPU_VR4121:
626 case CPU_VR4122: 608 case CPU_VR4122: