aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/cpu-probe.c2
-rw-r--r--arch/mips/kernel/idle.c1
-rw-r--r--arch/mips/kernel/perf_event_mipsxx.c6
-rw-r--r--arch/mips/kernel/spram.c1
-rw-r--r--arch/mips/kernel/traps.c1
5 files changed, 10 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 530f832de02c..ac09248b7468 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -806,7 +806,7 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
806 __cpu_name[cpu] = "MIPS 1004Kc"; 806 __cpu_name[cpu] = "MIPS 1004Kc";
807 break; 807 break;
808 case PRID_IMP_1074K: 808 case PRID_IMP_1074K:
809 c->cputype = CPU_74K; 809 c->cputype = CPU_1074K;
810 __cpu_name[cpu] = "MIPS 1074Kc"; 810 __cpu_name[cpu] = "MIPS 1074Kc";
811 break; 811 break;
812 case PRID_IMP_INTERAPTIV_UP: 812 case PRID_IMP_INTERAPTIV_UP:
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
index 3553243bf9d6..c1fd0bc7a315 100644
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -184,6 +184,7 @@ void __init check_wait(void)
184 case CPU_24K: 184 case CPU_24K:
185 case CPU_34K: 185 case CPU_34K:
186 case CPU_1004K: 186 case CPU_1004K:
187 case CPU_1074K:
187 case CPU_INTERAPTIV: 188 case CPU_INTERAPTIV:
188 case CPU_PROAPTIV: 189 case CPU_PROAPTIV:
189 cpu_wait = r4k_wait; 190 cpu_wait = r4k_wait;
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 24cdf64789c3..17594b81a5d2 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -1442,6 +1442,7 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
1442#endif 1442#endif
1443 break; 1443 break;
1444 case CPU_74K: 1444 case CPU_74K:
1445 case CPU_1074K:
1445 if (IS_BOTH_COUNTERS_74K_EVENT(base_id)) 1446 if (IS_BOTH_COUNTERS_74K_EVENT(base_id))
1446 raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD; 1447 raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
1447 else 1448 else
@@ -1584,6 +1585,11 @@ init_hw_perf_events(void)
1584 mipspmu.general_event_map = &mipsxxcore_event_map; 1585 mipspmu.general_event_map = &mipsxxcore_event_map;
1585 mipspmu.cache_event_map = &mipsxxcore_cache_map; 1586 mipspmu.cache_event_map = &mipsxxcore_cache_map;
1586 break; 1587 break;
1588 case CPU_1074K:
1589 mipspmu.name = "mips/1074K";
1590 mipspmu.general_event_map = &mipsxxcore_event_map;
1591 mipspmu.cache_event_map = &mipsxxcore_cache_map;
1592 break;
1587 case CPU_LOONGSON1: 1593 case CPU_LOONGSON1:
1588 mipspmu.name = "mips/loongson1"; 1594 mipspmu.name = "mips/loongson1";
1589 mipspmu.general_event_map = &mipsxxcore_event_map; 1595 mipspmu.general_event_map = &mipsxxcore_event_map;
diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c
index b242e2c10ea0..707d957e6a66 100644
--- a/arch/mips/kernel/spram.c
+++ b/arch/mips/kernel/spram.c
@@ -205,6 +205,7 @@ void spram_config(void)
205 case CPU_34K: 205 case CPU_34K:
206 case CPU_74K: 206 case CPU_74K:
207 case CPU_1004K: 207 case CPU_1004K:
208 case CPU_1074K:
208 case CPU_INTERAPTIV: 209 case CPU_INTERAPTIV:
209 case CPU_PROAPTIV: 210 case CPU_PROAPTIV:
210 config0 = read_c0_config(); 211 config0 = read_c0_config();
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index e0b499694d18..b0c7f80e05e5 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1337,6 +1337,7 @@ static inline void parity_protection_init(void)
1337 case CPU_34K: 1337 case CPU_34K:
1338 case CPU_74K: 1338 case CPU_74K:
1339 case CPU_1004K: 1339 case CPU_1004K:
1340 case CPU_1074K:
1340 case CPU_INTERAPTIV: 1341 case CPU_INTERAPTIV:
1341 case CPU_PROAPTIV: 1342 case CPU_PROAPTIV:
1342 { 1343 {