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>

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 07d41157afb2fb090286cf92f73c93f19d08b212..be28e3bd0cbae595871a9bc26a746aa962d310ce 100644 (file)
--- 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 7545fe69089f8da4968bdeb4534a8a5c4b4b5ea3..d57e1f4503ad2f96e2dfdae7c149623e2a0ba816 100644 (file)
--- 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 dc6488c1476320a8e501c0105a47b5259597756d..45601e4315d52dfb5fc2358022ccf0ca38381eb9 100644 (file)
--- 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 233c708fc12029fe6a4cedca86b3a023443762d8..e34d699f6f350a8ead5b73b5425a9e4180b3783f 100644 (file)
--- 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 0458a1c56419f3243967334b07ee62ac7f252897..980299dbeac3e4b30011e4ecd0fe9e12353da95d 100644 (file)
--- 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: