MIPS: X1000: Add X1000 system type.

Add X1000 system type for cat /proc/cpuinfo to give out X1000.

Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: ralf@linux-mips.org
Cc: paul@crapouillou.net
Cc: jhogan@kernel.org
Cc: fancer.lancer@gmail.com
Cc: chenhc@lemote.com
Cc: tglx@linutronix.de
Cc: gregkh@linuxfoundation.org
Cc: armijn@tjaldur.nl
Cc: syq@debian.org
Cc: jiaxun.yang@flygoat.com

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 235bc2f52113e157f38167bdb7b8e157fc6c6742..32ba103921f9ba645a83d5b5ab04c6ee0f1b9056 100644 (file)
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -81,6 +81,7 @@ enum loongson_machine_type {
 #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            */
 
 extern char *system_type;
 const char *get_system_type(void);

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 62a72bb3f0366afba3e619824c7e8cdb2c9243db..6826f0a657fb7f622d1f87e8976558f4c2cc6750 100644 (file)
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -47,7 +47,7 @@
 #define PRID_COMP_CAVIUM       0x0d0000
 #define PRID_COMP_LOONGSON     0x140000
 #define PRID_COMP_INGENIC_D0   0xd00000        /* JZ4740, JZ4750 */
-#define PRID_COMP_INGENIC_D1   0xd10000        /* JZ4770, JZ4775 */
+#define PRID_COMP_INGENIC_D1   0xd10000        /* JZ4770, JZ4775, X1000 */
 #define PRID_COMP_INGENIC_E1   0xe10000        /* JZ4780 */
 
 /*

diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 4264eaf030c327111dbe172da131bfa6945aed99..5c58f304fa0a757b083d76a3b964ea1cc275d5dc 100644 (file)
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -45,6 +45,8 @@ static void __init jz4740_detect_mem(void)
 
 static unsigned long __init get_board_mach_type(const void *fdt)
 {
+       if (!fdt_node_check_compatible(fdt, 0, "ingenic,x1000"))
+               return MACH_INGENIC_X1000;
        if (!fdt_node_check_compatible(fdt, 0, "ingenic,jz4780"))
                return MACH_INGENIC_JZ4780;
        if (!fdt_node_check_compatible(fdt, 0, "ingenic,jz4770"))
@@ -85,6 +87,8 @@ void __init device_tree_init(void)
 const char *get_system_type(void)
 {
        switch (mips_machtype) {
+       case MACH_INGENIC_X1000:
+               return "X1000";
        case MACH_INGENIC_JZ4780:
                return "JZ4780";
        case MACH_INGENIC_JZ4770: