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

MIPS: Loongson: Rename CPU device-tree binding

Loongson-3A R1/R2/R3 and Loongson-3B R1/R2 use the same package naming
in dts, and Loongson-3A R4 will be different. In cpu.h the classic 64bit
Loongson processors are called Loongson64C (C for classic, pre Loongson-
3A R4), and the new 64bit Loongson processors are called Loongson64G (G
for generic, Loongson-3A R4+). To keep consistency and make extensible,
we rename the classic "loongson3" prefix to "loongson64c", and the new
prefix for Loongson-3A R4+ will be "loongson64g".

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Huacai Chen and committed by
Thomas Bogendoerfer
f8523d0e 925a5675

+17 -17
+4 -4
Documentation/devicetree/bindings/mips/loongson/devices.yaml
··· 17 17 compatible: 18 18 oneOf: 19 19 20 - - description: Generic Loongson3 Quad Core + RS780E 20 + - description: Classic Loongson64 Quad Core + RS780E 21 21 items: 22 - - const: loongson,loongson3-4core-rs780e 22 + - const: loongson,loongson64c-4core-rs780e 23 23 24 - - description: Generic Loongson3 Octa Core + RS780E 24 + - description: Classic Loongson64 Octa Core + RS780E 25 25 items: 26 - - const: loongson,loongson3-8core-rs780e 26 + - const: loongson,loongson64c-8core-rs780e 27 27 ...
+1 -1
arch/mips/boot/dts/loongson/Makefile
··· 1 1 # SPDX_License_Identifier: GPL_2.0 2 - dtb-$(CONFIG_MACH_LOONGSON64) += loongson3_4core_rs780e.dtb loongson3_8core_rs780e.dtb 2 + dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_4core_rs780e.dtb loongson64c_8core_rs780e.dtb 3 3 4 4 obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
arch/mips/boot/dts/loongson/loongson3-package.dtsi arch/mips/boot/dts/loongson/loongson64c-package.dtsi
+4 -4
arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts
··· 2 2 3 3 /dts-v1/; 4 4 5 - #include "loongson3-package.dtsi" 5 + #include "loongson64c-package.dtsi" 6 6 #include "rs780e-pch.dtsi" 7 7 8 8 / { 9 - compatible = "loongson,loongson3-4core-rs780e"; 9 + compatible = "loongson,loongson3-8core-rs780e"; 10 10 }; 11 11 12 12 &package0 { 13 - htpic: interrupt-controller@efdfb000080 { 13 + htpic: interrupt-controller@1efdfb000080 { 14 14 compatible = "loongson,htpic-1.0"; 15 - reg = <0xefd 0xfb000080 0x40>; 15 + reg = <0x1efd 0xfb000080 0x40>; 16 16 interrupt-controller; 17 17 #interrupt-cells = <1>; 18 18
+4 -4
arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts
··· 2 2 3 3 /dts-v1/; 4 4 5 - #include "loongson3-package.dtsi" 5 + #include "loongson64c-package.dtsi" 6 6 #include "rs780e-pch.dtsi" 7 7 8 8 / { 9 - compatible = "loongson,loongson3-8core-rs780e"; 9 + compatible = "loongson,loongson3-4core-rs780e"; 10 10 }; 11 11 12 12 &package0 { 13 - htpic: interrupt-controller@1efdfb000080 { 13 + htpic: interrupt-controller@efdfb000080 { 14 14 compatible = "loongson,htpic-1.0"; 15 - reg = <0x1efd 0xfb000080 0x40>; 15 + reg = <0xefd 0xfb000080 0x40>; 16 16 interrupt-controller; 17 17 #interrupt-cells = <1>; 18 18
+2 -2
arch/mips/include/asm/mach-loongson64/builtin_dtbs.h
··· 8 8 #ifndef __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_ 9 9 #define __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_ 10 10 11 - extern u32 __dtb_loongson3_4core_rs780e_begin[]; 12 - extern u32 __dtb_loongson3_8core_rs780e_begin[]; 11 + extern u32 __dtb_loongson64c_4core_rs780e_begin[]; 12 + extern u32 __dtb_loongson64c_8core_rs780e_begin[]; 13 13 #endif
+2 -2
arch/mips/loongson64/env.c
··· 133 133 case PRID_REV_LOONGSON3A_R2_1: 134 134 case PRID_REV_LOONGSON3A_R3_0: 135 135 case PRID_REV_LOONGSON3A_R3_1: 136 - loongson_fdt_blob = __dtb_loongson3_4core_rs780e_begin; 136 + loongson_fdt_blob = __dtb_loongson64c_4core_rs780e_begin; 137 137 break; 138 138 case PRID_REV_LOONGSON3B_R1: 139 139 case PRID_REV_LOONGSON3B_R2: 140 - loongson_fdt_blob = __dtb_loongson3_8core_rs780e_begin; 140 + loongson_fdt_blob = __dtb_loongson64c_8core_rs780e_begin; 141 141 break; 142 142 default: 143 143 break;