Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Huacai Chen <chenhuacai@gmail.com>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: 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 02/14] MIPS: Loongson 3: Add Lemote-3A machtypes definition.
Date: Fri, 15 Jun 2012 16:09:49 +0800	[thread overview]
Message-ID: <1339747801-28691-3-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1339747801-28691-1-git-send-email-chenhc@lemote.com>

Add three Loongson 3 based machine types:
MACH_LEMOTE_A1004 is laptop;
MACH_LEMOTE_A1101 is mini-itx;
MACH_LEMOTE_A1205 is all-in-one machine.

The most significant differrent between A1004 and A1101/A1205 is
the laptop has 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              |   23 +++++++++++++--------
 arch/mips/include/asm/mach-loongson/machine.h |    6 +++++
 arch/mips/loongson/Kconfig                    |   26 +++++++++++++++++++++++++
 arch/mips/loongson/common/machtype.c          |    5 +++-
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 7a51d87..d5da63e 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -61,15 +61,20 @@
 /*
  * 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_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 4321338..481c5d9 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_A1004
+
+#endif /* CONFIG_LEMOTE_MACH3A */
+
 #endif /* __ASM_MACH_LOONGSON_MACHINE_H */
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index d46a923..6c56c97 100644
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -58,6 +58,32 @@ config LEMOTE_MACH2F
 
 	  These family machines include fuloong2f mini PC, yeeloong2f notebook,
 	  LingLoong allinone PC and so forth.
+
+config LEMOTE_MACH3A
+	bool "Lemote Loongson 3A family machines"
+	select ARCH_SPARSEMEM_ENABLE
+	select GENERIC_ISA_DMA_SUPPORT_BROKEN
+	select GENERIC_HARDIRQS_NO__DO_IRQ
+	select BOOT_ELF32
+	select BOARD_SCACHE
+	select CSRC_R4K
+	select CEVT_R4K
+	select CPU_HAS_WB
+	select HW_HAS_PCI
+	select ISA
+	select I8259
+	select IRQ_CPU
+	select SYS_HAS_CPU_LOONGSON3
+	select SYS_HAS_EARLY_PRINTK
+	select SYS_SUPPORTS_SMP
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_64BIT_KERNEL
+	select SYS_SUPPORTS_HIGHMEM
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select LOONGSON_MC146818
+	help
+		Lemote Loongson 3A family machines utilize the 3A revision of
+		Loongson processor and RS780/SBX00 chipset.
 endchoice
 
 config CS5536
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 2efd5d9..e377b44 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -25,8 +25,11 @@ static const char *system_types[] = {
 	[MACH_LEMOTE_ML2F7]             "lemote-mengloong-2f-7inches",
 	[MACH_LEMOTE_YL2F89]            "lemote-yeeloong-2f-8.9inches",
 	[MACH_DEXXON_GDIUM2F10]         "dexxon-gdium-2f",
-	[MACH_LEMOTE_NAS]		"lemote-nas-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_A1205]             "lemote-2gq-aio-a1205",
 	[MACH_LOONGSON_END]             NULL,
 };
 
-- 
1.7.7.3

  parent reply	other threads:[~2012-06-15  8:11 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-15  8:09 [PATCH 00/14] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-06-15  8:09 ` [PATCH 01/14] MIPS: Loongson: Add basic Loongson 3 CPU support Huacai Chen
2012-06-15 15:59   ` David Daney
2012-06-15 16:13     ` Ralf Baechle
2012-06-16 12:49       ` huacai chen
2012-06-15  8:09 ` Huacai Chen [this message]
2012-06-15  8:09 ` [PATCH 03/14] MIPS: Loongson: Make Loongson 3 to use BCD format for RTC Huacai Chen
2012-06-15  8:09 ` [PATCH 04/14] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-06-15  8:09 ` [PATCH 05/14] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-06-15 14:34   ` LIU Qi
2012-06-15  8:09 ` [PATCH 06/14] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-06-15 14:32   ` LIU Qi
2012-06-15  8:09 ` [PATCH 07/14] MIPS: Loongson 3: Add serial port support Huacai Chen
2012-06-15  9:50   ` Arnaud Patard
2012-06-15 11:44     ` huacai chen
2012-06-15  8:09 ` [PATCH 08/14] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2012-06-15  8:09 ` [PATCH 09/14] ata: Use 32bit DMA in AHCI for Loongson 3 Huacai Chen
2012-06-15 10:04   ` Sergei Shtylyov
2012-06-15 12:42     ` huacai chen
2012-06-17 12:05       ` Borislav Petkov
2012-06-18  9:04         ` huacai chen
2012-06-18 10:10           ` Borislav Petkov
2012-06-18 10:41             ` Huacai Chen
2012-06-18 14:52               ` Borislav Petkov
2012-06-15  8:09 ` [PATCH 10/14] drm/radeon: Make radeon card usable for Loongson Huacai Chen
2012-06-15 14:28   ` LIU Qi
2012-06-15  8:09 ` [PATCH 11/14] ALSA: Make hda sound " Huacai Chen
2012-06-15  8:09 ` [PATCH 12/14] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-06-15  8:10 ` [PATCH 13/14] MIPS: Loongson 3: Add CPU Hotplug support Huacai Chen
2012-06-15  8:10 ` [PATCH 14/14] MIPS: Loongson: Add a Loongson 3 default config file Huacai Chen
2012-06-15 14:37   ` LIU Qi
2012-06-16 12:52     ` huacai chen
2012-06-15 13:10 ` [PATCH 00/14] MIPS: Add Loongson-3 based machines support LIU Qi
2012-06-16 12:46   ` huacai chen

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=1339747801-28691-3-git-send-email-chenhc@lemote.com \
    --to=chenhuacai@gmail.com \
    --cc=chenhc@lemote.com \
    --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