MIPS: ingenic: Use enum instead of macros for Ingenic SoCs

Use an enum instead of macros to represent the various versions of the
Ingenic SoCs, and add some of the SoC versions that were previously
missing.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index c3bd9b2..26f267d 100644 (file)
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -65,12 +65,22 @@ enum loongson2ef_machine_type {
 /*
  * Valid machtype for group INGENIC
  */
-#define  MACH_INGENIC_JZ4730   0       /* JZ4730 SOC           */
-#define  MACH_INGENIC_JZ4740   1       /* JZ4740 SOC           */
-#define  MACH_INGENIC_JZ4770   2       /* JZ4770 SOC           */
-#define  MACH_INGENIC_JZ4780   3       /* JZ4780 SOC           */
-#define  MACH_INGENIC_X1000            4       /* X1000 SOC            */
-#define  MACH_INGENIC_X1830            5       /* X1830 SOC            */
+enum ingenic_machine_type {
+       MACH_INGENIC_UNKNOWN,
+       MACH_INGENIC_JZ4720,
+       MACH_INGENIC_JZ4725,
+       MACH_INGENIC_JZ4725B,
+       MACH_INGENIC_JZ4730,
+       MACH_INGENIC_JZ4740,
+       MACH_INGENIC_JZ4750,
+       MACH_INGENIC_JZ4755,
+       MACH_INGENIC_JZ4760,
+       MACH_INGENIC_JZ4770,
+       MACH_INGENIC_JZ4775,
+       MACH_INGENIC_JZ4780,
+       MACH_INGENIC_X1000,
+       MACH_INGENIC_X1830,
+};
 
 extern char *system_type;
 const char *get_system_type(void);