MIPS: Loongson: Rename CPU device-tree binding
Subsystems (3)
PATCH 1/2 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".
---
Documentation/devicetree/bindings/mips/loongson/devices.yaml | 8 ++++----
arch/mips/boot/dts/loongson/Makefile | 2 +-
.../loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} | 0
.../{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} | 2 +-
.../{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} | 2 +-
arch/mips/include/asm/mach-loongson64/builtin_dtbs.h | 4 ++--
arch/mips/loongson64/env.c | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
rename arch/mips/boot/dts/loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} (100%)
rename arch/mips/boot/dts/loongson/{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} (93%)
rename arch/mips/boot/dts/loongson/{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} (93%)Documentation/devicetree/bindings/mips/loongson/devices.yaml +4 -4
@@ -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 ...
arch/mips/boot/dts/loongson/Makefile +1 -1
@@ -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))
arch/mips/boot/dts/loongson/loongson64c-package.dtsi renamed from arch/mips/boot/dts/loongson/loongson3-package.dtsi +0 -0
arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts renamed from arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts +1 -1
@@ -2,7 +2,7 @@ /dts-v1/; -#include "loongson3-package.dtsi" +#include "loongson64c-package.dtsi" #include "rs780e-pch.dtsi" / {
arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts renamed from arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts +1 -1
@@ -2,7 +2,7 @@ /dts-v1/; -#include "loongson3-package.dtsi" +#include "loongson64c-package.dtsi" #include "rs780e-pch.dtsi" / {
arch/mips/include/asm/mach-loongson64/builtin_dtbs.h +2 -2
@@ -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
arch/mips/loongson64/env.c +2 -2
@@ -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 ;
Signature · 1 line
2.7.0
PATCH 2/2 dt-bindings: mips: Document two Loongson boards
Document loongson64c-4core-ls7a and loongson64g-4core-ls7a, two boards with LS7A PCH.
--- Documentation/devicetree/bindings/mips/loongson/devices.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/mips/loongson/devices.yaml +8 -0
@@ -17,6 +17,10 @@ properties: compatible: oneOf: + - description: Classic Loongson64 Quad Core + LS7A + items: + - const: loongson,loongson64c-4core-ls7a + - description: Classic Loongson64 Quad Core + RS780E items: - const: loongson,loongson64c-4core-rs780e
@@ -24,4 +28,8 @@ properties: - description: Classic Loongson64 Octa Core + RS780E items: - const: loongson,loongson64c-8core-rs780e + + - description: Generic Loongson64 Quad Core + LS7A + items: + - const: loongson,loongson64g-4core-ls7a ...
Signature · 1 line
2.7.0
Re: [PATCH 2/2] dt-bindings: mips: Document two Loongson boards
Quoted 8 lines · Huacai Chen
Document loongson64c-4core-ls7a and loongson64g-4core-ls7a, two boards with LS7A PCH.
Signed-off-by Huacai Chen <[email protected]>Signed-off-by Jiaxun Yang <[email protected]>--- Documentation/devicetree/bindings/mips/loongson/devices.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 9 lines · Huacai Chen
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.hthe 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 <[email protected]>
Quoted 12 lines
---
Documentation/devicetree/bindings/mips/loongson/devices.yaml | 8 ++++----
arch/mips/boot/dts/loongson/Makefile | 2 +-
.../loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} | 0
.../{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} | 2 +-
.../{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} | 2 +-
arch/mips/include/asm/mach-loongson64/builtin_dtbs.h | 4 ++--
arch/mips/loongson64/env.c | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
rename arch/mips/boot/dts/loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} (100%)
rename arch/mips/boot/dts/loongson/{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} (93%)
rename arch/mips/boot/dts/loongson/{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} (93%)applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]