summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorWu Zhangjin <wuzhangjin@gmail.com>2009-11-17 00:58:14 +0800
committerRalf Baechle <ralf@linux-mips.org>2009-12-17 01:57:18 +0000
commite13fb77661b62f49170ef30d707272c568f81681 (patch)
tree603f674181a03f9b834506155e5498b8c07960ac /arch/mips
parenta3a0f8c8ed2e2470f4dcd6da95020d41fed84747 (diff)
MIPS: Lemote 2F: Add NAS support
Kernel support for this machine is almost the same as Fuloong 2F; the only difference is that it uses the serial port provided by Loongson 2F processor as Yeeloong 2F does. Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/656/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/bootinfo.h3
-rw-r--r--arch/mips/loongson/common/machtype.c1
-rw-r--r--arch/mips/loongson/common/serial.c1
-rw-r--r--arch/mips/loongson/common/uart_base.c1
-rw-r--r--arch/mips/loongson/lemote-2f/reset.c2
5 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 07d41157afb..be28e3bd0cb 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -67,7 +67,8 @@
#define MACH_LEMOTE_ML2F7 3
#define MACH_LEMOTE_YL2F89 4
#define MACH_DEXXON_GDIUM2F10 5
-#define MACH_LOONGSON_END 6
+#define MACH_LEMOTE_NAS 6
+#define MACH_LOONGSON_END 7
extern char *system_type;
const char *get_system_type(void);
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 7545fe69089..d57e1f4503a 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -25,6 +25,7 @@ static const char *system_types[] = {
[MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches",
[MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches",
[MACH_DEXXON_GDIUM2F10] "dexxon-gidum-2f-10inches",
+ [MACH_LEMOTE_NAS] "lemote-nas-2f",
[MACH_LOONGSON_END] NULL,
};
diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c
index dc6488c1476..45601e4315d 100644
--- a/arch/mips/loongson/common/serial.c
+++ b/arch/mips/loongson/common/serial.c
@@ -45,6 +45,7 @@ static struct plat_serial8250_port uart8250_data[][2] = {
[MACH_LEMOTE_ML2F7] {PORT_M(3), {} },
[MACH_LEMOTE_YL2F89] {PORT_M(3), {} },
[MACH_DEXXON_GDIUM2F10] {PORT_M(3), {} },
+ [MACH_LEMOTE_NAS] {PORT_M(3), {} },
[MACH_LOONGSON_END] {},
};
diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c
index 233c708fc12..e34d699f6f3 100644
--- a/arch/mips/loongson/common/uart_base.c
+++ b/arch/mips/loongson/common/uart_base.c
@@ -23,6 +23,7 @@ unsigned long __maybe_unused uart8250_base[] = {
[MACH_LEMOTE_ML2F7] (LOONGSON_LIO1_BASE + 0x3f8),
[MACH_LEMOTE_YL2F89] (LOONGSON_LIO1_BASE + 0x3f8),
[MACH_DEXXON_GDIUM2F10] (LOONGSON_LIO1_BASE + 0x3f8),
+ [MACH_LEMOTE_NAS] (LOONGSON_LIO1_BASE + 0x3f8),
[MACH_LOONGSON_END] 0,
};
EXPORT_SYMBOL(uart8250_base);
diff --git a/arch/mips/loongson/lemote-2f/reset.c b/arch/mips/loongson/lemote-2f/reset.c
index 0458a1c5641..980299dbeac 100644
--- a/arch/mips/loongson/lemote-2f/reset.c
+++ b/arch/mips/loongson/lemote-2f/reset.c
@@ -141,6 +141,7 @@ void mach_prepare_reboot(void)
{
switch (mips_machtype) {
case MACH_LEMOTE_FL2F:
+ case MACH_LEMOTE_NAS:
fl2f_reboot();
break;
case MACH_LEMOTE_ML2F7:
@@ -158,6 +159,7 @@ void mach_prepare_shutdown(void)
{
switch (mips_machtype) {
case MACH_LEMOTE_FL2F:
+ case MACH_LEMOTE_NAS:
fl2f_shutdown();
break;
case MACH_LEMOTE_ML2F7: