diff options
author | Huacai Chen <chenhc@lemote.com> | 2014-03-21 06:44:01 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 12:17:12 -0400 |
commit | 5f6d693ebb4993c49a0d150da1c5fff15867fec0 (patch) | |
tree | d51adc4098a1685080c4562b9db7bd5df633a160 | |
parent | c579d310b9b22b4b9fedcdd720c8ac58c901e1e9 (diff) |
MIPS: Loongson 3: Add Lemote-3A machtypes definition
Add four Loongson-3 based machine types:
MACH_LEMOTE_A1004/MACH_LEMOTE_A1201 are laptops;
MACH_LEMOTE_A1101 is mini-itx;
MACH_LEMOTE_A1205 is all-in-one machine.
The most significant differrent between A1004/A1201 and A1101/A1205 is
the laptops have EC but others don't.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Tested-by: Alex Smith <alex.smith@imgtec.com>
Reviewed-by: Alex Smith <alex.smith@imgtec.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/6631
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/bootinfo.h | 24 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-loongson/machine.h | 6 | ||||
-rw-r--r-- | arch/mips/loongson/common/machtype.c | 4 |
3 files changed, 25 insertions, 9 deletions
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h index 83a4db4e3794..1f7ca8b00404 100644 --- a/arch/mips/include/asm/bootinfo.h +++ b/arch/mips/include/asm/bootinfo.h | |||
@@ -61,15 +61,21 @@ | |||
61 | /* | 61 | /* |
62 | * Valid machtype for Loongson family | 62 | * Valid machtype for Loongson family |
63 | */ | 63 | */ |
64 | #define MACH_LOONGSON_UNKNOWN 0 | 64 | enum loongson_machine_type { |
65 | #define MACH_LEMOTE_FL2E 1 | 65 | MACH_LOONGSON_UNKNOWN, |
66 | #define MACH_LEMOTE_FL2F 2 | 66 | MACH_LEMOTE_FL2E, |
67 | #define MACH_LEMOTE_ML2F7 3 | 67 | MACH_LEMOTE_FL2F, |
68 | #define MACH_LEMOTE_YL2F89 4 | 68 | MACH_LEMOTE_ML2F7, |
69 | #define MACH_DEXXON_GDIUM2F10 5 | 69 | MACH_LEMOTE_YL2F89, |
70 | #define MACH_LEMOTE_NAS 6 | 70 | MACH_DEXXON_GDIUM2F10, |
71 | #define MACH_LEMOTE_LL2F 7 | 71 | MACH_LEMOTE_NAS, |
72 | #define MACH_LOONGSON_END 8 | 72 | MACH_LEMOTE_LL2F, |
73 | MACH_LEMOTE_A1004, | ||
74 | MACH_LEMOTE_A1101, | ||
75 | MACH_LEMOTE_A1201, | ||
76 | MACH_LEMOTE_A1205, | ||
77 | MACH_LOONGSON_END | ||
78 | }; | ||
73 | 79 | ||
74 | /* | 80 | /* |
75 | * Valid machtype for group INGENIC | 81 | * Valid machtype for group INGENIC |
diff --git a/arch/mips/include/asm/mach-loongson/machine.h b/arch/mips/include/asm/mach-loongson/machine.h index 3810d5ca84ac..1b1f592fa2be 100644 --- a/arch/mips/include/asm/mach-loongson/machine.h +++ b/arch/mips/include/asm/mach-loongson/machine.h | |||
@@ -24,4 +24,10 @@ | |||
24 | 24 | ||
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #ifdef CONFIG_LEMOTE_MACH3A | ||
28 | |||
29 | #define LOONGSON_MACHTYPE MACH_LEMOTE_A1101 | ||
30 | |||
31 | #endif /* CONFIG_LEMOTE_MACH3A */ | ||
32 | |||
27 | #endif /* __ASM_MACH_LOONGSON_MACHINE_H */ | 33 | #endif /* __ASM_MACH_LOONGSON_MACHINE_H */ |
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c index 4becd4f9ef2e..1a4797984b8d 100644 --- a/arch/mips/loongson/common/machtype.c +++ b/arch/mips/loongson/common/machtype.c | |||
@@ -27,6 +27,10 @@ static const char *system_types[] = { | |||
27 | [MACH_DEXXON_GDIUM2F10] "dexxon-gdium-2f", | 27 | [MACH_DEXXON_GDIUM2F10] "dexxon-gdium-2f", |
28 | [MACH_LEMOTE_NAS] "lemote-nas-2f", | 28 | [MACH_LEMOTE_NAS] "lemote-nas-2f", |
29 | [MACH_LEMOTE_LL2F] "lemote-lynloong-2f", | 29 | [MACH_LEMOTE_LL2F] "lemote-lynloong-2f", |
30 | [MACH_LEMOTE_A1004] "lemote-3a-notebook-a1004", | ||
31 | [MACH_LEMOTE_A1101] "lemote-3a-itx-a1101", | ||
32 | [MACH_LEMOTE_A1201] "lemote-2gq-notebook-a1201", | ||
33 | [MACH_LEMOTE_A1205] "lemote-2gq-aio-a1205", | ||
30 | [MACH_LOONGSON_END] NULL, | 34 | [MACH_LOONGSON_END] NULL, |
31 | }; | 35 | }; |
32 | 36 | ||