hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Huacai Chen 2020-06-15 14:04:16 +08:00 committed by Thomas Bogendoerfer
parent 925a567542
commit f8523d0e83
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/devicetree/bindings/mips/loongson/devices.yaml
View File

@ -17,11 +17,11 @@ properties:
compatible:
oneOf:
- description: Generic Loongson3 Quad Core + RS780E
- description: Classic Loongson64 Quad Core + RS780E
items:
- const: loongson,loongson3-4core-rs780e
- const: loongson,loongson64c-4core-rs780e
- description: Generic Loongson3 Octa Core + RS780E
- description: Classic Loongson64 Octa Core + RS780E
items:
- const: loongson,loongson3-8core-rs780e
- const: loongson,loongson64c-8core-rs780e
...

2
arch/mips/boot/dts/loongson/Makefile
View File

@ -1,4 +1,4 @@
# 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))

0
arch/mips/boot/dts/loongson/loongson3-package.dtsi → arch/mips/boot/dts/loongson/loongson64c-package.dtsi
View File

2
arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts → arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts
View File

@ -2,7 +2,7 @@
/dts-v1/;
#include "loongson3-package.dtsi"
#include "loongson64c-package.dtsi"
#include "rs780e-pch.dtsi"
/ {

2
arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts → arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts
View File

@ -2,7 +2,7 @@
/dts-v1/;
#include "loongson3-package.dtsi"
#include "loongson64c-package.dtsi"
#include "rs780e-pch.dtsi"
/ {

4
arch/mips/include/asm/mach-loongson64/builtin_dtbs.h
View File

@ -8,6 +8,6 @@
#ifndef __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_
#define __ASM_MACH_LOONGSON64_BUILTIN_DTBS_H_
extern u32 __dtb_loongson3_4core_rs780e_begin[];
extern u32 __dtb_loongson3_8core_rs780e_begin[];
extern u32 __dtb_loongson64c_4core_rs780e_begin[];
extern u32 __dtb_loongson64c_8core_rs780e_begin[];
#endif

4
arch/mips/loongson64/env.c
View File

@ -133,11 +133,11 @@ void __init prom_init_env(void)
case PRID_REV_LOONGSON3A_R2_1:
case PRID_REV_LOONGSON3A_R3_0:
case PRID_REV_LOONGSON3A_R3_1:
loongson_fdt_blob = __dtb_loongson3_4core_rs780e_begin;
loongson_fdt_blob = __dtb_loongson64c_4core_rs780e_begin;
break;
case PRID_REV_LOONGSON3B_R1:
case PRID_REV_LOONGSON3B_R2:
loongson_fdt_blob = __dtb_loongson3_8core_rs780e_begin;
loongson_fdt_blob = __dtb_loongson64c_8core_rs780e_begin;
break;
default:
break;