Commit f8523d0e authored by Huacai Chen's avatar Huacai Chen Committed by Thomas Bogendoerfer

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: default avatarHuacai Chen <chenhc@lemote.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 925a5675
...@@ -17,11 +17,11 @@ properties: ...@@ -17,11 +17,11 @@ properties:
compatible: compatible:
oneOf: oneOf:
- description: Generic Loongson3 Quad Core + RS780E - description: Classic Loongson64 Quad Core + RS780E
items: items:
- const: loongson,loongson3-4core-rs780e - const: loongson,loongson64c-4core-rs780e
- description: Generic Loongson3 Octa Core + RS780E - description: Classic Loongson64 Octa Core + RS780E
items: items:
- const: loongson,loongson3-8core-rs780e - const: loongson,loongson64c-8core-rs780e
... ...
# SPDX_License_Identifier: GPL_2.0 # SPDX_License_Identifier: GPL_2.0
dtb-$(CONFIG_MACH_LOONGSON64) += loongson3_4core_rs780e.dtb loongson3_8core_rs780e.dtb dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_4core_rs780e.dtb loongson64c_8core_rs780e.dtb
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y)) obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/dts-v1/; /dts-v1/;
#include "loongson3-package.dtsi" #include "loongson64c-package.dtsi"
#include "rs780e-pch.dtsi" #include "rs780e-pch.dtsi"
/ { / {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/dts-v1/; /dts-v1/;
#include "loongson3-package.dtsi" #include "loongson64c-package.dtsi"
#include "rs780e-pch.dtsi" #include "rs780e-pch.dtsi"
/ { / {
......
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
#ifndef __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_ #ifndef __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_
#define __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_ #define __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_
extern u32 __dtb_loongson3_4core_rs780e_begin[]; extern u32 __dtb_loongson64c_4core_rs780e_begin[];
extern u32 __dtb_loongson3_8core_rs780e_begin[]; extern u32 __dtb_loongson64c_8core_rs780e_begin[];
#endif #endif
...@@ -133,11 +133,11 @@ void __init prom_init_env(void) ...@@ -133,11 +133,11 @@ void __init prom_init_env(void)
case PRID_REV_LOONGSON3A_R2_1: case PRID_REV_LOONGSON3A_R2_1:
case PRID_REV_LOONGSON3A_R3_0: case PRID_REV_LOONGSON3A_R3_0:
case PRID_REV_LOONGSON3A_R3_1: case PRID_REV_LOONGSON3A_R3_1:
loongson_fdt_blob = __dtb_loongson3_4core_rs780e_begin; loongson_fdt_blob = __dtb_loongson64c_4core_rs780e_begin;
break; break;
case PRID_REV_LOONGSON3B_R1: case PRID_REV_LOONGSON3B_R1:
case PRID_REV_LOONGSON3B_R2: case PRID_REV_LOONGSON3B_R2:
loongson_fdt_blob = __dtb_loongson3_8core_rs780e_begin; loongson_fdt_blob = __dtb_loongson64c_8core_rs780e_begin;
break; break;
default: default:
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment