linux-mips
[Top] [All Lists]

[PATCH V18 04/13] MIPS: Loongson 3: Add Lemote-3A machtypes definition

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH V18 04/13] MIPS: Loongson 3: Add Lemote-3A machtypes definition
From: Huacai Chen <chenhc@lemote.com>
Date: Thu, 13 Feb 2014 20:08:54 +0800
Cc: John Crispin <john@phrozen.org>, "Steven J. Hill" <Steven.Hill@imgtec.com>, Aurelien Jarno <aurelien@aurel32.net>, 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>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=eNuX3wIs9PqJEHsPQ+OS0S17CjoPHld/L+P2RyOO1go=; b=I2uIC2ZCJiBHlCnLy09sB/ouAJhgF4KRc0VBrgany8/tiNY8sT5aMAQluNvd9/kelE FMF1+++SxvPbSEN+usH285bHm3T0OS5zsWhLkNzNjl7+PsWICaM7qUwEJ9XvzLeRInQ1 /rNRBm3QwAjGLB0irD3ww1YumTpxfaMtaM4sHSLg+Ylu7EophkA8GWSsUjRo6SRlWu6M VshEBYHWAHjaPwjWTDZGt+TIxd7kkgBYHwyGGH8bxKQwOFGQQCttDzxLijGgRWQztpLt k+ajDzSdyx5b+js71JWgGc/bAFzmxe9ZD4/SfMwNabt2telIOJrms9sPPKEK+GZNIjnN 4S6g==
In-reply-to: <1392293343-5453-1-git-send-email-chenhc@lemote.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1392293343-5453-1-git-send-email-chenhc@lemote.com>
Sender: linux-mips-bounce@linux-mips.org
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>
---
 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


<Prev in Thread] Current Thread [Next in Thread>