Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Huacai Chen <chenhc@lemote.com>
[paulburton@kernel.org: Fix checkpatch whitespace warning in irqflags.h]
Signed-off-by: Paul 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>

authored by

Huacai Chen and committed by
Paul Burton
b2afb64c dece3c2a

+17 -17
+3 -3
arch/mips/Kconfig
··· 1511 1511 config CPU_LOONGSON1B 1512 1512 bool "Loongson 1B" 1513 1513 depends on SYS_HAS_CPU_LOONGSON1B 1514 - select CPU_LOONGSON1 1514 + select CPU_LOONGSON32 1515 1515 select LEDS_GPIO_REGISTER 1516 1516 help 1517 1517 The Loongson 1B is a 32-bit SoC, which implements the MIPS32 ··· 1521 1521 config CPU_LOONGSON1C 1522 1522 bool "Loongson 1C" 1523 1523 depends on SYS_HAS_CPU_LOONGSON1C 1524 - select CPU_LOONGSON1 1524 + select CPU_LOONGSON32 1525 1525 select LEDS_GPIO_REGISTER 1526 1526 help 1527 1527 The Loongson 1C is a 32-bit SoC, which implements the MIPS32 ··· 1920 1920 select ARCH_HAS_PHYS_TO_DMA 1921 1921 select CPU_HAS_LOAD_STORE_LR 1922 1922 1923 - config CPU_LOONGSON1 1923 + config CPU_LOONGSON32 1924 1924 bool 1925 1925 select CPU_MIPS32 1926 1926 select CPU_MIPSR2
+1 -1
arch/mips/include/asm/cpu-type.h
··· 25 25 26 26 #if defined(CONFIG_SYS_HAS_CPU_LOONGSON1B) || \ 27 27 defined(CONFIG_SYS_HAS_CPU_LOONGSON1C) 28 - case CPU_LOONGSON1: 28 + case CPU_LOONGSON32: 29 29 #endif 30 30 31 31 #ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1
+1 -1
arch/mips/include/asm/cpu.h
··· 312 312 */ 313 313 CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K, 314 314 CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350, 315 - CPU_BMIPS4380, CPU_BMIPS5000, CPU_XBURST, CPU_LOONGSON1, CPU_M14KC, 315 + CPU_BMIPS4380, CPU_BMIPS5000, CPU_XBURST, CPU_LOONGSON32, CPU_M14KC, 316 316 CPU_M14KEC, CPU_INTERAPTIV, CPU_P5600, CPU_PROAPTIV, CPU_1074K, 317 317 CPU_M5150, CPU_I6400, CPU_P6600, CPU_M6250, 318 318
+1 -1
arch/mips/include/asm/irqflags.h
··· 41 41 " .set push \n" 42 42 " .set reorder \n" 43 43 " .set noat \n" 44 - #if defined(CONFIG_CPU_LOONGSON64) || defined (CONFIG_CPU_LOONGSON1) 44 + #if defined(CONFIG_CPU_LOONGSON64) || defined(CONFIG_CPU_LOONGSON32) 45 45 " mfc0 %[flags], $12 \n" 46 46 " di \n" 47 47 #else
+2 -2
arch/mips/include/asm/module.h
··· 119 119 #define MODULE_PROC_FAMILY "RM7000 " 120 120 #elif defined CONFIG_CPU_SB1 121 121 #define MODULE_PROC_FAMILY "SB1 " 122 - #elif defined CONFIG_CPU_LOONGSON1 123 - #define MODULE_PROC_FAMILY "LOONGSON1 " 122 + #elif defined CONFIG_CPU_LOONGSON32 123 + #define MODULE_PROC_FAMILY "LOONGSON32 " 124 124 #elif defined CONFIG_CPU_LOONGSON2EF 125 125 #define MODULE_PROC_FAMILY "LOONGSON2EF " 126 126 #elif defined CONFIG_CPU_LOONGSON64
+1 -1
arch/mips/kernel/cpu-probe.c
··· 1571 1571 case PRID_IMP_LOONGSON_32: /* Loongson-1 */ 1572 1572 decode_configs(c); 1573 1573 1574 - c->cputype = CPU_LOONGSON1; 1574 + c->cputype = CPU_LOONGSON32; 1575 1575 1576 1576 switch (c->processor_id & PRID_REV_MASK) { 1577 1577 case PRID_REV_LOONGSON1B:
+1 -1
arch/mips/kernel/idle.c
··· 173 173 case CPU_CAVIUM_OCTEON2: 174 174 case CPU_CAVIUM_OCTEON3: 175 175 case CPU_XBURST: 176 - case CPU_LOONGSON1: 176 + case CPU_LOONGSON32: 177 177 case CPU_XLR: 178 178 case CPU_XLP: 179 179 cpu_wait = r4k_wait;
+1 -1
arch/mips/kernel/perf_event_mipsxx.c
··· 1764 1764 mipspmu.general_event_map = &mipsxxcore_event_map; 1765 1765 mipspmu.cache_event_map = &mipsxxcore_cache_map; 1766 1766 break; 1767 - case CPU_LOONGSON1: 1767 + case CPU_LOONGSON32: 1768 1768 mipspmu.name = "mips/loongson1"; 1769 1769 mipspmu.general_event_map = &mipsxxcore_event_map; 1770 1770 mipspmu.cache_event_map = &mipsxxcore_cache_map;
+1 -1
arch/mips/kernel/traps.c
··· 1761 1761 1762 1762 case CPU_5KC: 1763 1763 case CPU_5KE: 1764 - case CPU_LOONGSON1: 1764 + case CPU_LOONGSON32: 1765 1765 write_c0_ecc(0x80000000); 1766 1766 back_to_back_c0_hazard(); 1767 1767 /* Set the PE bit (bit 31) in the c0_errctl register. */
+1 -1
arch/mips/loongson32/Kconfig
··· 38 38 menuconfig CEVT_CSRC_LS1X 39 39 bool "Use PWM Timer for clockevent/clocksource" 40 40 select MIPS_EXTERNAL_TIMER 41 - depends on CPU_LOONGSON1 41 + depends on CPU_LOONGSON32 42 42 help 43 43 This option changes the default clockevent/clocksource to PWM Timer, 44 44 and is required by Loongson1 CPUFreq support.
+2 -2
arch/mips/loongson32/Platform
··· 1 - cflags-$(CONFIG_CPU_LOONGSON1) += -march=mips32r2 -Wa,--trap 1 + cflags-$(CONFIG_CPU_LOONGSON32) += -march=mips32r2 -Wa,--trap 2 2 platform-$(CONFIG_MACH_LOONGSON32) += loongson32/ 3 3 cflags-$(CONFIG_MACH_LOONGSON32) += -I$(srctree)/arch/mips/include/asm/mach-loongson32 4 - load-$(CONFIG_CPU_LOONGSON1) += 0xffffffff80200000 4 + load-$(CONFIG_CPU_LOONGSON32) += 0xffffffff80200000
+1 -1
arch/mips/oprofile/common.c
··· 93 93 case CPU_P5600: 94 94 case CPU_I6400: 95 95 case CPU_M5150: 96 - case CPU_LOONGSON1: 96 + case CPU_LOONGSON32: 97 97 case CPU_SB1: 98 98 case CPU_SB1A: 99 99 case CPU_R10000:
+1 -1
arch/mips/oprofile/op_model_mipsxx.c
··· 420 420 op_model_mipsxx_ops.cpu_type = "mips/sb1"; 421 421 break; 422 422 423 - case CPU_LOONGSON1: 423 + case CPU_LOONGSON32: 424 424 op_model_mipsxx_ops.cpu_type = "mips/loongson1"; 425 425 break; 426 426