| Message ID | 1592201057-28151-1-git-send-email-chenhc@lemote.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f8523d0e83613ab8d082cd504dc53a09fbba4889 |
| Headers | show |
| Series | [1/2] MIPS: Loongson: Rename CPU device-tree binding | expand |
On Mon, Jun 15, 2020 at 02:04:16PM +0800, Huacai Chen wrote: > 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> > --- > 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.
diff --git a/Documentation/devicetree/bindings/mips/loongson/devices.yaml b/Documentation/devicetree/bindings/mips/loongson/devices.yaml index 74ed4e3..0516fe2 100644 --- a/Documentation/devicetree/bindings/mips/loongson/devices.yaml +++ b/Documentation/devicetree/bindings/mips/loongson/devices.yaml @@ -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 ... diff --git a/arch/mips/boot/dts/loongson/Makefile b/arch/mips/boot/dts/loongson/Makefile index 56d3794..aa5069a 100644 --- a/arch/mips/boot/dts/loongson/Makefile +++ b/arch/mips/boot/dts/loongson/Makefile @@ -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)) diff --git a/arch/mips/boot/dts/loongson/loongson3-package.dtsi b/arch/mips/boot/dts/loongson/loongson64c-package.dtsi similarity index 100% rename from arch/mips/boot/dts/loongson/loongson3-package.dtsi rename to arch/mips/boot/dts/loongson/loongson64c-package.dtsi diff --git a/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts b/arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts similarity index 93% rename from arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts rename to arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts index 6b5694c..acd53a1 100644 --- a/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts +++ b/arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts @@ -2,7 +2,7 @@ /dts-v1/; -#include "loongson3-package.dtsi" +#include "loongson64c-package.dtsi" #include "rs780e-pch.dtsi" / { diff --git a/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts b/arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts similarity index 93% rename from arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts rename to arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts index ffefa2f..433f9c3 100644 --- a/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts +++ b/arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts @@ -2,7 +2,7 @@ /dts-v1/; -#include "loongson3-package.dtsi" +#include "loongson64c-package.dtsi" #include "rs780e-pch.dtsi" / { diff --git a/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h b/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h index 853c6d80..930c8a1 100644 --- a/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h +++ b/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h @@ -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 diff --git a/arch/mips/loongson64/env.c b/arch/mips/loongson64/env.c index d11bc34..3e7caba 100644 --- a/arch/mips/loongson64/env.c +++ b/arch/mips/loongson64/env.c @@ -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;
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> --- 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%)