Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 113c62d9 authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

MIPS: Add support for the M14Kc core. 



[ralf@linux-mips.org: Fixed whitespace damage.]

Signed-off-by: default avatarSteven J. Hill <sjhill@mips.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3773/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 839efb4f

arch/mips/include/asm/cpu.h

+3 −2
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define PRID_IMP_24KE		0x9600

#define PRID_IMP_74K		0x9700

#define PRID_IMP_1004K		0x9900

#define PRID_IMP_M14KC		0x9c00



/*

 * These are the PRID's for when 23:16 == PRID_COMP_SIBYTE
@@ -260,7 +261,7 @@ enum cpu_type_enum { 
	 */

	CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,

	CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350,

	CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC,

	CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC, CPU_M14KC,



	/*

	 * MIPS64 class processors

arch/mips/kernel/cpu-probe.c

+6 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright (C) xxxx  the Anonymous

 * Copyright (C) 1994 - 2006 Ralf Baechle

 * Copyright (C) 2003, 2004  Maciej W. Rozycki

 * Copyright (C) 2001, 2004  MIPS Inc.

 * Copyright (C) 2001, 2004, 2011, 2012  MIPS Technologies, Inc.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -199,6 +199,7 @@ void __init check_wait(void) 
		cpu_wait = rm7k_wait_irqoff;

		break;



	case CPU_M14KC:

	case CPU_24K:

	case CPU_34K:

	case CPU_1004K:
@@ -831,6 +832,10 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu) 
		c->cputype = CPU_74K;

		__cpu_name[cpu] = "MIPS 74Kc";

		break;

	case PRID_IMP_M14KC:

		c->cputype = CPU_M14KC;

		__cpu_name[cpu] = "MIPS M14Kc";

		break;

	case PRID_IMP_1004K:

		c->cputype = CPU_1004K;

		__cpu_name[cpu] = "MIPS 1004Kc";

arch/mips/mm/c-r4k.c

+1 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,7 @@ static void __cpuinit probe_pcache(void) 
	case CPU_R14000:

		break;



	case CPU_M14KC:

	case CPU_24K:

	case CPU_34K:

	case CPU_74K:

arch/mips/mm/tlbex.c

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * Copyright (C) 2005, 2007, 2008, 2009  Maciej W. Rozycki

 * Copyright (C) 2006  Ralf Baechle (ralf@linux-mips.org)

 * Copyright (C) 2008, 2009 Cavium Networks, Inc.

 * Copyright (C) 2011  MIPS Technologies, Inc.

 *

 * ... and the days got worse and worse and now you see

 * I've gone completly out of my mind.
@@ -494,6 +495,7 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, 
	case CPU_R14000:

	case CPU_4KC:

	case CPU_4KEC:

	case CPU_M14KC:

	case CPU_SB1:

	case CPU_SB1A:

	case CPU_4KSC:

arch/mips/oprofile/common.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) 


	switch (current_cpu_type()) {

	case CPU_5KC:

	case CPU_M14KC:

	case CPU_20KC:

	case CPU_24K:

	case CPU_25KF: