From: Huacai Chen <chenhc@lemote.com>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: John Crispin <john@phrozen.org>,
linux-mips@linux-mips.org, Fuxin Zhang <zhangfx@lemote.com>,
Zhangjin Wu <wuzhangjin@gmail.com>,
Huacai Chen <chenhc@lemote.com>, Hongliang Tao <taohl@lemote.com>,
Hua Yan <yanh@lemote.com>
Subject: [PATCH V12 03/12] MIPS: Loongson 3: Add Lemote-3A machtypes definition
Date: Wed, 25 Sep 2013 17:15:37 +0800 [thread overview]
Message-ID: <1380100546-8302-4-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1380100546-8302-1-git-send-email-chenhc@lemote.com>
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>
---
arch/mips/include/asm/bootinfo.h | 24 +++++++++++++++---------
arch/mips/include/asm/mach-loongson/machine.h | 6 ++++++
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 4d2cdea..09956a0 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -61,15 +61,21 @@
/*
* Valid machtype for Loongson family
*/
-#define MACH_LOONGSON_UNKNOWN 0
-#define MACH_LEMOTE_FL2E 1
-#define MACH_LEMOTE_FL2F 2
-#define MACH_LEMOTE_ML2F7 3
-#define MACH_LEMOTE_YL2F89 4
-#define MACH_DEXXON_GDIUM2F10 5
-#define MACH_LEMOTE_NAS 6
-#define MACH_LEMOTE_LL2F 7
-#define MACH_LOONGSON_END 8
+enum loongson_machine_type {
+ MACH_LOONGSON_UNKNOWN,
+ MACH_LEMOTE_FL2E,
+ MACH_LEMOTE_FL2F,
+ MACH_LEMOTE_ML2F7,
+ MACH_LEMOTE_YL2F89,
+ MACH_DEXXON_GDIUM2F10,
+ MACH_LEMOTE_NAS,
+ MACH_LEMOTE_LL2F,
+ MACH_LEMOTE_A1004,
+ MACH_LEMOTE_A1101,
+ MACH_LEMOTE_A1201,
+ MACH_LEMOTE_A1205,
+ MACH_LOONGSON_END
+};
/*
* 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 3810d5c..1b1f592 100644
--- a/arch/mips/include/asm/mach-loongson/machine.h
+++ b/arch/mips/include/asm/mach-loongson/machine.h
@@ -24,4 +24,10 @@
#endif
+#ifdef CONFIG_LEMOTE_MACH3A
+
+#define LOONGSON_MACHTYPE MACH_LEMOTE_A1101
+
+#endif /* CONFIG_LEMOTE_MACH3A */
+
#endif /* __ASM_MACH_LOONGSON_MACHINE_H */
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 4becd4f..1a47979 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -27,6 +27,10 @@ static const char *system_types[] = {
[MACH_DEXXON_GDIUM2F10] "dexxon-gdium-2f",
[MACH_LEMOTE_NAS] "lemote-nas-2f",
[MACH_LEMOTE_LL2F] "lemote-lynloong-2f",
+ [MACH_LEMOTE_A1004] "lemote-3a-notebook-a1004",
+ [MACH_LEMOTE_A1101] "lemote-3a-itx-a1101",
+ [MACH_LEMOTE_A1201] "lemote-2gq-notebook-a1201",
+ [MACH_LEMOTE_A1205] "lemote-2gq-aio-a1205",
[MACH_LOONGSON_END] NULL,
};
--
1.7.7.3
next prev parent reply other threads:[~2013-09-25 9:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 9:15 [PATCH V12 00/13] MIPS: Add Loongson-3 based machines support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 01/12] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2013-09-25 21:17 ` David Daney
2013-09-25 9:15 ` [PATCH V12 02/12] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
2013-09-25 9:15 ` Huacai Chen [this message]
2013-09-25 9:15 ` [PATCH V12 04/12] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 05/12] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 06/12] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 07/12] MIPS: Loongson 3: Add serial port support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 08/12] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2013-09-25 9:15 ` [PATCH V12 09/12] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
2013-09-25 21:20 ` David Daney
2013-09-25 9:15 ` [PATCH V12 10/12] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 11/12] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
2013-09-25 9:15 ` [PATCH V12 12/12] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
2013-09-26 12:45 ` [PATCH V12 00/13] MIPS: Add Loongson-3 based machines support Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380100546-8302-4-git-send-email-chenhc@lemote.com \
--to=chenhc@lemote.com \
--cc=john@phrozen.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=taohl@lemote.com \
--cc=wuzhangjin@gmail.com \
--cc=yanh@lemote.com \
--cc=zhangfx@lemote.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox