1 files changed, 48 insertions, 40 deletions
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 4b907369b0f9..5d28dbe06f40 100644
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -28,46 +28,54 @@ struct smatch {
 };
 static struct smatch mach_table[] = {
-        {       "SGI-IP22",
+        {
-                "SGI Indy",
+                .arcname        = "SGI-IP22",
-                MACH_GROUP_SGI,
+                .liname         = "SGI Indy",
-                MACH_SGI_IP22,
+                .group          = MACH_GROUP_SGI,
-                PROM_FLAG_ARCS
+                .type           = MACH_SGI_IP22,
-        }, {    "SGI-IP27",
+                .flags          = PROM_FLAG_ARCS,
-                "SGI Origin",
+        }, {
-                MACH_GROUP_SGI,
+                .arcname        = "SGI-IP27",
-                MACH_SGI_IP27,
+                .liname         = "SGI Origin",
-                PROM_FLAG_ARCS
+                .group          = MACH_GROUP_SGI,
-        }, {    "SGI-IP28",
+                .type           = MACH_SGI_IP27,
-                "SGI IP28",
+                .flags          = PROM_FLAG_ARCS,
-                MACH_GROUP_SGI,
+        }, {
-                MACH_SGI_IP28,
+                .arcname        = "SGI-IP28",
-                PROM_FLAG_ARCS
+                .liname         = "SGI IP28",
-        }, {    "SGI-IP30",
+                .group          = MACH_GROUP_SGI,
-                "SGI Octane",
+                .type           = MACH_SGI_IP28,
-                MACH_GROUP_SGI,
+                .flags          = PROM_FLAG_ARCS,
-                MACH_SGI_IP30,
+        }, {
-                PROM_FLAG_ARCS
+                .arcname        = "SGI-IP30",
-        }, {    "SGI-IP32",
+                .liname         = "SGI Octane",
-                "SGI O2",
+                .group          = MACH_GROUP_SGI,
-                MACH_GROUP_SGI,
+                .type           = MACH_SGI_IP30,
-                MACH_SGI_IP32,
+                .flags          = PROM_FLAG_ARCS,
-                PROM_FLAG_ARCS
+        }, {
-        }, {    "Microsoft-Jazz",
+                .arcname        = "SGI-IP32",
-                "Jazz MIPS_Magnum_4000",
+                .liname         = "SGI O2",
-                MACH_GROUP_JAZZ,
+                .group          = MACH_GROUP_SGI,
-                MACH_MIPS_MAGNUM_4000,
+                .type           = MACH_SGI_IP32,
-                0
+                .flags          = PROM_FLAG_ARCS,
-        }, {    "PICA-61",
+        }, {
-                "Jazz Acer_PICA_61",
+                .arcname        = "Microsoft-Jazz",
-                MACH_GROUP_JAZZ,
+                .liname         = "Jazz MIPS_Magnum_4000",
-                MACH_ACER_PICA_61,
+                .group          = MACH_GROUP_JAZZ,
-                0
+                .type           = MACH_MIPS_MAGNUM_4000,
-        }, {    "RM200PCI",
+                .flags          = 0,
-                "SNI RM200_PCI",
+        }, {
-                MACH_GROUP_SNI_RM,
+                .arcname        = "PICA-61",
-                MACH_SNI_RM200_PCI,
+                .liname         = "Jazz Acer_PICA_61",
-                PROM_FLAG_DONT_FREE_TEMP
+                .group          = MACH_GROUP_JAZZ,
+                .type           = MACH_ACER_PICA_61,
+                .flags          = 0,
+        }, {
+                .arcname        = "RM200PCI",
+                .liname         = "SNI RM200_PCI",
+                .group          = MACH_GROUP_SNI_RM,
+                .type           = MACH_SNI_RM200_PCI,
+                .flags          = PROM_FLAG_DONT_FREE_TEMP,
        }
 };

diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 4b907369b0f9..5d28dbe06f40 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c
@@ -28,46 +28,54 @@ struct smatch {
28	};	28	};
29		29
30	static struct smatch mach_table[] = {	30	static struct smatch mach_table[] = {
31	{ "SGI-IP22",	31	{
32	"SGI Indy",	32	.arcname = "SGI-IP22",
33	MACH_GROUP_SGI,	33	.liname = "SGI Indy",
34	MACH_SGI_IP22,	34	.group = MACH_GROUP_SGI,
35	PROM_FLAG_ARCS	35	.type = MACH_SGI_IP22,
36	}, { "SGI-IP27",	36	.flags = PROM_FLAG_ARCS,
37	"SGI Origin",	37	}, {
38	MACH_GROUP_SGI,	38	.arcname = "SGI-IP27",
39	MACH_SGI_IP27,	39	.liname = "SGI Origin",
40	PROM_FLAG_ARCS	40	.group = MACH_GROUP_SGI,
41	}, { "SGI-IP28",	41	.type = MACH_SGI_IP27,
42	"SGI IP28",	42	.flags = PROM_FLAG_ARCS,
43	MACH_GROUP_SGI,	43	}, {
44	MACH_SGI_IP28,	44	.arcname = "SGI-IP28",
45	PROM_FLAG_ARCS	45	.liname = "SGI IP28",
46	}, { "SGI-IP30",	46	.group = MACH_GROUP_SGI,
47	"SGI Octane",	47	.type = MACH_SGI_IP28,
48	MACH_GROUP_SGI,	48	.flags = PROM_FLAG_ARCS,
49	MACH_SGI_IP30,	49	}, {
50	PROM_FLAG_ARCS	50	.arcname = "SGI-IP30",
51	}, { "SGI-IP32",	51	.liname = "SGI Octane",
52	"SGI O2",	52	.group = MACH_GROUP_SGI,
53	MACH_GROUP_SGI,	53	.type = MACH_SGI_IP30,
54	MACH_SGI_IP32,	54	.flags = PROM_FLAG_ARCS,
55	PROM_FLAG_ARCS	55	}, {
56	}, { "Microsoft-Jazz",	56	.arcname = "SGI-IP32",
57	"Jazz MIPS_Magnum_4000",	57	.liname = "SGI O2",
58	MACH_GROUP_JAZZ,	58	.group = MACH_GROUP_SGI,
59	MACH_MIPS_MAGNUM_4000,	59	.type = MACH_SGI_IP32,
60	0	60	.flags = PROM_FLAG_ARCS,
61	}, { "PICA-61",	61	}, {
62	"Jazz Acer_PICA_61",	62	.arcname = "Microsoft-Jazz",
63	MACH_GROUP_JAZZ,	63	.liname = "Jazz MIPS_Magnum_4000",
64	MACH_ACER_PICA_61,	64	.group = MACH_GROUP_JAZZ,
65	0	65	.type = MACH_MIPS_MAGNUM_4000,
66	}, { "RM200PCI",	66	.flags = 0,
67	"SNI RM200_PCI",	67	}, {
68	MACH_GROUP_SNI_RM,	68	.arcname = "PICA-61",
69	MACH_SNI_RM200_PCI,	69	.liname = "Jazz Acer_PICA_61",
70	PROM_FLAG_DONT_FREE_TEMP	70	.group = MACH_GROUP_JAZZ,
		71	.type = MACH_ACER_PICA_61,
		72	.flags = 0,
		73	}, {
		74	.arcname = "RM200PCI",
		75	.liname = "SNI RM200_PCI",
		76	.group = MACH_GROUP_SNI_RM,
		77	.type = MACH_SNI_RM200_PCI,
		78	.flags = PROM_FLAG_DONT_FREE_TEMP,
71	}	79	}
72	};	80	};
73		81