Le sam. 19 sept. 2020 à 20:44, 周琰杰 (Zhou Yanjie)
<zhouyanjie@xxxxxxxxxxxxxx> a écrit :
Add X1000 system type for cat /proc/cpuinfo to give out X1000E.
Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@xxxxxxxxxxxxxx>
For the 2 patches:
Reviewed-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Cheers,
-Paul
---
arch/mips/generic/board-ingenic.c | 3 +++
arch/mips/include/asm/bootinfo.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/arch/mips/generic/board-ingenic.c
b/arch/mips/generic/board-ingenic.c
index 0d7de8f9713d..c634ee35a6cd 100644
--- a/arch/mips/generic/board-ingenic.c
+++ b/arch/mips/generic/board-ingenic.c
@@ -23,6 +23,8 @@ static __init char
*ingenic_get_system_type(unsigned long machtype)
switch (machtype) {
case MACH_INGENIC_X1830:
return "X1830";
+ case MACH_INGENIC_X1000E:
+ return "X1000E";
case MACH_INGENIC_X1000:
return "X1000";
case MACH_INGENIC_JZ4780:
@@ -58,6 +60,7 @@ static const struct of_device_id ingenic_of_match[]
__initconst = {
{ .compatible = "ingenic,jz4770", .data = (void
*)MACH_INGENIC_JZ4770 },
{ .compatible = "ingenic,jz4780", .data = (void
*)MACH_INGENIC_JZ4780 },
{ .compatible = "ingenic,x1000", .data = (void *)MACH_INGENIC_X1000
},
+ { .compatible = "ingenic,x1000e", .data = (void
*)MACH_INGENIC_X1000E },
{ .compatible = "ingenic,x1830", .data = (void *)MACH_INGENIC_X1830
},
{}
};
diff --git a/arch/mips/include/asm/bootinfo.h
b/arch/mips/include/asm/bootinfo.h
index 147c9327ce04..b6fdfbec1f07 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -79,6 +79,7 @@ enum ingenic_machine_type {
MACH_INGENIC_JZ4775,
MACH_INGENIC_JZ4780,
MACH_INGENIC_X1000,
+ MACH_INGENIC_X1000E,
MACH_INGENIC_X1830,
MACH_INGENIC_X2000,
};
--
2.11.0
