aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2014-01-22 11:19:38 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 18:09:11 -0400
commitaced4cbd6e3da7dd71f19d0378d27aa74f76e70b (patch)
treeb39ea1e677c6f9b737fb85ab858097ba45fd3bec /arch
parentf43e4dfd3902a06bcc1cc1f1d96ba109f8156dda (diff)
MIPS: Add cases for CPU_P5600
Add a CPU_P5600 case to various switch statements, doing the same thing as for CPU_PROAPTIV. Signed-off-by: James Hogan <james.hogan@imgtec.com> Reviewed-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6408/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/cpu-type.h1
-rw-r--r--arch/mips/kernel/idle.c1
-rw-r--r--arch/mips/kernel/spram.c1
-rw-r--r--arch/mips/kernel/traps.c1
-rw-r--r--arch/mips/mm/c-r4k.c1
-rw-r--r--arch/mips/mm/sc-mips.c1
-rw-r--r--arch/mips/mm/tlbex.c1
7 files changed, 7 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
index 02f591bd95ca..61f803be4c2e 100644
--- a/arch/mips/include/asm/cpu-type.h
+++ b/arch/mips/include/asm/cpu-type.h
@@ -46,6 +46,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
46 case CPU_M14KEC: 46 case CPU_M14KEC:
47 case CPU_INTERAPTIV: 47 case CPU_INTERAPTIV:
48 case CPU_PROAPTIV: 48 case CPU_PROAPTIV:
49 case CPU_P5600:
49#endif 50#endif
50 51
51#ifdef CONFIG_SYS_HAS_CPU_MIPS64_R1 52#ifdef CONFIG_SYS_HAS_CPU_MIPS64_R1
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
index c1fd0bc7a315..04ea1c7a3d31 100644
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -187,6 +187,7 @@ void __init check_wait(void)
187 case CPU_1074K: 187 case CPU_1074K:
188 case CPU_INTERAPTIV: 188 case CPU_INTERAPTIV:
189 case CPU_PROAPTIV: 189 case CPU_PROAPTIV:
190 case CPU_P5600:
190 cpu_wait = r4k_wait; 191 cpu_wait = r4k_wait;
191 if (read_c0_config7() & MIPS_CONF7_WII) 192 if (read_c0_config7() & MIPS_CONF7_WII)
192 cpu_wait = r4k_wait_irqoff; 193 cpu_wait = r4k_wait_irqoff;
diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c
index 707d957e6a66..f9a693a6aaa7 100644
--- a/arch/mips/kernel/spram.c
+++ b/arch/mips/kernel/spram.c
@@ -208,6 +208,7 @@ void spram_config(void)
208 case CPU_1074K: 208 case CPU_1074K:
209 case CPU_INTERAPTIV: 209 case CPU_INTERAPTIV:
210 case CPU_PROAPTIV: 210 case CPU_PROAPTIV:
211 case CPU_P5600:
211 config0 = read_c0_config(); 212 config0 = read_c0_config();
212 /* FIXME: addresses are Malta specific */ 213 /* FIXME: addresses are Malta specific */
213 if (config0 & (1<<24)) { 214 if (config0 & (1<<24)) {
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 7ac4d8f44cf0..ee1f2fc584ea 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1439,6 +1439,7 @@ static inline void parity_protection_init(void)
1439 case CPU_1074K: 1439 case CPU_1074K:
1440 case CPU_INTERAPTIV: 1440 case CPU_INTERAPTIV:
1441 case CPU_PROAPTIV: 1441 case CPU_PROAPTIV:
1442 case CPU_P5600:
1442 { 1443 {
1443#define ERRCTL_PE 0x80000000 1444#define ERRCTL_PE 0x80000000
1444#define ERRCTL_L2P 0x00800000 1445#define ERRCTL_L2P 0x00800000
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index d72e9a16cf14..6c37d21ef2fb 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1115,6 +1115,7 @@ static void probe_pcache(void)
1115 case CPU_1004K: 1115 case CPU_1004K:
1116 case CPU_1074K: 1116 case CPU_1074K:
1117 case CPU_INTERAPTIV: 1117 case CPU_INTERAPTIV:
1118 case CPU_P5600:
1118 case CPU_PROAPTIV: 1119 case CPU_PROAPTIV:
1119 if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K)) 1120 if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K))
1120 alias_74k_erratum(c); 1121 alias_74k_erratum(c);
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 7b3977035a46..99eb8fabab60 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -79,6 +79,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
79 case CPU_1074K: 79 case CPU_1074K:
80 case CPU_INTERAPTIV: 80 case CPU_INTERAPTIV:
81 case CPU_PROAPTIV: 81 case CPU_PROAPTIV:
82 case CPU_P5600:
82 case CPU_BMIPS5000: 83 case CPU_BMIPS5000:
83 if (config2 & (1 << 12)) 84 if (config2 & (1 << 12))
84 return 0; 85 return 0;
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 151ca264c8a6..ccae9a46e222 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -511,6 +511,7 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l,
511 case CPU_74K: 511 case CPU_74K:
512 case CPU_1074K: 512 case CPU_1074K:
513 case CPU_PROAPTIV: 513 case CPU_PROAPTIV:
514 case CPU_P5600:
514 break; 515 break;
515 516
516 default: 517 default: