diff options
author | Wu Zhangjin <wuzhangjin@gmail.com> | 2009-11-16 11:58:14 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-12-16 20:57:18 -0500 |
commit | e13fb77661b62f49170ef30d707272c568f81681 (patch) | |
tree | 603f674181a03f9b834506155e5498b8c07960ac /arch/mips/loongson | |
parent | a3a0f8c8ed2e2470f4dcd6da95020d41fed84747 (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/loongson')
-rw-r--r-- | arch/mips/loongson/common/machtype.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson/common/serial.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson/common/uart_base.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson/lemote-2f/reset.c | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c index 7545fe69089f..d57e1f4503ad 100644 --- a/arch/mips/loongson/common/machtype.c +++ b/arch/mips/loongson/common/machtype.c | |||
@@ -25,6 +25,7 @@ static const char *system_types[] = { | |||
25 | [MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches", | 25 | [MACH_LEMOTE_ML2F7] "lemote-mengloong-2f-7inches", |
26 | [MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches", | 26 | [MACH_LEMOTE_YL2F89] "lemote-yeeloong-2f-8.9inches", |
27 | [MACH_DEXXON_GDIUM2F10] "dexxon-gidum-2f-10inches", | 27 | [MACH_DEXXON_GDIUM2F10] "dexxon-gidum-2f-10inches", |
28 | [MACH_LEMOTE_NAS] "lemote-nas-2f", | ||
28 | [MACH_LOONGSON_END] NULL, | 29 | [MACH_LOONGSON_END] NULL, |
29 | }; | 30 | }; |
30 | 31 | ||
diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c index dc6488c14763..45601e4315d5 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] = { | |||
45 | [MACH_LEMOTE_ML2F7] {PORT_M(3), {} }, | 45 | [MACH_LEMOTE_ML2F7] {PORT_M(3), {} }, |
46 | [MACH_LEMOTE_YL2F89] {PORT_M(3), {} }, | 46 | [MACH_LEMOTE_YL2F89] {PORT_M(3), {} }, |
47 | [MACH_DEXXON_GDIUM2F10] {PORT_M(3), {} }, | 47 | [MACH_DEXXON_GDIUM2F10] {PORT_M(3), {} }, |
48 | [MACH_LEMOTE_NAS] {PORT_M(3), {} }, | ||
48 | [MACH_LOONGSON_END] {}, | 49 | [MACH_LOONGSON_END] {}, |
49 | }; | 50 | }; |
50 | 51 | ||
diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c index 233c708fc120..e34d699f6f35 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[] = { | |||
23 | [MACH_LEMOTE_ML2F7] (LOONGSON_LIO1_BASE + 0x3f8), | 23 | [MACH_LEMOTE_ML2F7] (LOONGSON_LIO1_BASE + 0x3f8), |
24 | [MACH_LEMOTE_YL2F89] (LOONGSON_LIO1_BASE + 0x3f8), | 24 | [MACH_LEMOTE_YL2F89] (LOONGSON_LIO1_BASE + 0x3f8), |
25 | [MACH_DEXXON_GDIUM2F10] (LOONGSON_LIO1_BASE + 0x3f8), | 25 | [MACH_DEXXON_GDIUM2F10] (LOONGSON_LIO1_BASE + 0x3f8), |
26 | [MACH_LEMOTE_NAS] (LOONGSON_LIO1_BASE + 0x3f8), | ||
26 | [MACH_LOONGSON_END] 0, | 27 | [MACH_LOONGSON_END] 0, |
27 | }; | 28 | }; |
28 | EXPORT_SYMBOL(uart8250_base); | 29 | EXPORT_SYMBOL(uart8250_base); |
diff --git a/arch/mips/loongson/lemote-2f/reset.c b/arch/mips/loongson/lemote-2f/reset.c index 0458a1c56419..980299dbeac3 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) | |||
141 | { | 141 | { |
142 | switch (mips_machtype) { | 142 | switch (mips_machtype) { |
143 | case MACH_LEMOTE_FL2F: | 143 | case MACH_LEMOTE_FL2F: |
144 | case MACH_LEMOTE_NAS: | ||
144 | fl2f_reboot(); | 145 | fl2f_reboot(); |
145 | break; | 146 | break; |
146 | case MACH_LEMOTE_ML2F7: | 147 | case MACH_LEMOTE_ML2F7: |
@@ -158,6 +159,7 @@ void mach_prepare_shutdown(void) | |||
158 | { | 159 | { |
159 | switch (mips_machtype) { | 160 | switch (mips_machtype) { |
160 | case MACH_LEMOTE_FL2F: | 161 | case MACH_LEMOTE_FL2F: |
162 | case MACH_LEMOTE_NAS: | ||
161 | fl2f_shutdown(); | 163 | fl2f_shutdown(); |
162 | break; | 164 | break; |
163 | case MACH_LEMOTE_ML2F7: | 165 | case MACH_LEMOTE_ML2F7: |