Unverified Commit b2afb64c authored by Huacai Chen's avatar Huacai Chen Committed by Paul Burton
Browse files

MIPS: Loongson: Rename LOONGSON1 to LOONGSON32 



Now old Loongson-2E/2F use LOONGSON2EF and will be removed in future,
newer Loongson-2/3 use LOONGSON64. So rename LOONGSON1 to LOONGSON32
will make the naming style more unified.

Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
[paulburton@kernel.org: Fix checkpatch whitespace warning in irqflags.h]
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: linux-mips@vger.kernel.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Huacai Chen <chenhuacai@gmail.com>
parent dece3c2a

arch/mips/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ config CPU_LOONGSON2F 
config CPU_LOONGSON1B

	bool "Loongson 1B"

	depends on SYS_HAS_CPU_LOONGSON1B

	select CPU_LOONGSON1

	select CPU_LOONGSON32

	select LEDS_GPIO_REGISTER

	help

	  The Loongson 1B is a 32-bit SoC, which implements the MIPS32
@@ -1521,7 +1521,7 @@ config CPU_LOONGSON1B 
config CPU_LOONGSON1C

	bool "Loongson 1C"

	depends on SYS_HAS_CPU_LOONGSON1C

	select CPU_LOONGSON1

	select CPU_LOONGSON32

	select LEDS_GPIO_REGISTER

	help

	  The Loongson 1C is a 32-bit SoC, which implements the MIPS32
@@ -1920,7 +1920,7 @@ config CPU_LOONGSON2EF 
	select ARCH_HAS_PHYS_TO_DMA

	select CPU_HAS_LOAD_STORE_LR



config CPU_LOONGSON1

config CPU_LOONGSON32

	bool

	select CPU_MIPS32

	select CPU_MIPSR2

arch/mips/include/asm/cpu-type.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) 


#if defined(CONFIG_SYS_HAS_CPU_LOONGSON1B) || \

    defined(CONFIG_SYS_HAS_CPU_LOONGSON1C)

	case CPU_LOONGSON1:

	case CPU_LOONGSON32:

#endif



#ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1

arch/mips/include/asm/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,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_XBURST, CPU_LOONGSON1, CPU_M14KC,

	CPU_BMIPS4380, CPU_BMIPS5000, CPU_XBURST, CPU_LOONGSON32, CPU_M14KC,

	CPU_M14KEC, CPU_INTERAPTIV, CPU_P5600, CPU_PROAPTIV, CPU_1074K,

	CPU_M5150, CPU_I6400, CPU_P6600, CPU_M6250,

arch/mips/include/asm/irqflags.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline unsigned long arch_local_irq_save(void) 
	"	.set	push						\n"

	"	.set	reorder						\n"

	"	.set	noat						\n"

#if defined(CONFIG_CPU_LOONGSON64) || defined (CONFIG_CPU_LOONGSON1)

#if defined(CONFIG_CPU_LOONGSON64) || defined(CONFIG_CPU_LOONGSON32)

	"	mfc0	%[flags], $12					\n"

	"	di							\n"

#else

arch/mips/include/asm/module.h

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ search_module_dbetables(unsigned long addr) 
#define MODULE_PROC_FAMILY "RM7000 "

#elif defined CONFIG_CPU_SB1

#define MODULE_PROC_FAMILY "SB1 "

#elif defined CONFIG_CPU_LOONGSON1

#define MODULE_PROC_FAMILY "LOONGSON1 "

#elif defined CONFIG_CPU_LOONGSON32

#define MODULE_PROC_FAMILY "LOONGSON32 "

#elif defined CONFIG_CPU_LOONGSON2EF

#define MODULE_PROC_FAMILY "LOONGSON2EF "

#elif defined CONFIG_CPU_LOONGSON64

CRA Git | Maintained and supported by SUSTech CRA and CCSE