MIPS: Ingenic: Add system type for new Ingenic SoCs.

Add JZ4775, X1000E, X2000, and X2000E system type for cat /proc/cpuinfo
to give out JZ4775, X1000E, X2000 and X2000E.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/generic/board-ingenic.c b/arch/mips/generic/board-ingenic.c
index 0d7de8f9713d78c7db5b08a5578d65c1963a3e2c..0cec0bea13d6ae73c0c4202656aedb46f95d1cbd 100644 (file)
--- a/arch/mips/generic/board-ingenic.c
+++ b/arch/mips/generic/board-ingenic.c
@@ -21,12 +21,20 @@
 static __init char *ingenic_get_system_type(unsigned long machtype)
 {
        switch (machtype) {
+       case MACH_INGENIC_X2000E:
+               return "X2000E";
+       case MACH_INGENIC_X2000:
+               return "X2000";
        case MACH_INGENIC_X1830:
                return "X1830";
+       case MACH_INGENIC_X1000E:
+               return "X1000E";
        case MACH_INGENIC_X1000:
                return "X1000";
        case MACH_INGENIC_JZ4780:
                return "JZ4780";
+       case MACH_INGENIC_JZ4775:
+               return "JZ4775";
        case MACH_INGENIC_JZ4770:
                return "JZ4770";
        case MACH_INGENIC_JZ4725B:
@@ -56,9 +64,13 @@ static const struct of_device_id ingenic_of_match[] __initconst = {
        { .compatible = "ingenic,jz4740", .data = (void *)MACH_INGENIC_JZ4740 },
        { .compatible = "ingenic,jz4725b", .data = (void *)MACH_INGENIC_JZ4725B },
        { .compatible = "ingenic,jz4770", .data = (void *)MACH_INGENIC_JZ4770 },
+       { .compatible = "ingenic,jz4775", .data = (void *)MACH_INGENIC_JZ4775 },
        { .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 },
+       { .compatible = "ingenic,x2000", .data = (void *)MACH_INGENIC_X2000 },
+       { .compatible = "ingenic,x2000e", .data = (void *)MACH_INGENIC_X2000E },
        {}
 };
 

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 147c9327ce04472484be8fa106bc7ba76e376a2c..6dd173a22aeb393b51afbf8e9730308c98c87ac3 100644 (file)
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -79,8 +79,10 @@ enum ingenic_machine_type {
        MACH_INGENIC_JZ4775,
        MACH_INGENIC_JZ4780,
        MACH_INGENIC_X1000,
+       MACH_INGENIC_X1000E,
        MACH_INGENIC_X1830,
        MACH_INGENIC_X2000,
+       MACH_INGENIC_X2000E,
 };
 
 extern char *system_type;