Add Apple cores, fix Phytium core names

See https://www.spinics.net/lists/arm-kernel/msg879381.html and https://en.wikipedia.org/wiki/FeiTeng_(processor)#Future_processors (S2500 and D2000 are SoCs and contain 4 or 8 FTC663 cores).

diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
index c10438dc29e1bee84208fcdece153ea6a606a5f5..ea8430ffa5e63ec00bb70830becde68aacd986ff 100644 (file)
--- a/sys-utils/lscpu-arm.c
+++ b/sys-utils/lscpu-arm.c
@@ -147,6 +147,12 @@ static const struct id_part marvell_part[] = {
     { -1, "unknown" },
 };
 
+static const struct id_part apple_part[] = {
+    { 0x022, "Icestorm" },
+    { 0x023, "Firestorm" },
+    { -1, "unknown" },
+};
+
 static const struct id_part faraday_part[] = {
     { 0x526, "FA526" },
     { 0x626, "FA626" },
@@ -189,8 +195,8 @@ static const struct id_part hisi_part[] = {
 };
 
 static const struct id_part ft_part[] = {
-    { 0x662, "FT2000PLUS" },
-    { 0x663, "S2500" },
+    { 0x662, "FTC662" },
+    { 0x663, "FTC663" },
     { -1, "unknown" },
 };
 
@@ -218,7 +224,7 @@ static const struct hw_impl hw_implementer[] = {
     { 0x51, qcom_part,    "Qualcomm" },
     { 0x53, samsung_part, "Samsung" },
     { 0x56, marvell_part, "Marvell" },
-    { 0x61, unknown_part, "Apple" },
+    { 0x61, apple_part,   "Apple" },
     { 0x66, faraday_part, "Faraday" },
     { 0x69, intel_part,   "Intel" },
     { 0x70, ft_part,      "Phytium" },