diff options
-rw-r--r-- | arch/mips/include/asm/bootinfo.h | 3 | ||||
-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 |
5 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h index be28e3bd0cba..09eee09780f2 100644 --- a/arch/mips/include/asm/bootinfo.h +++ b/arch/mips/include/asm/bootinfo.h | |||
@@ -68,7 +68,8 @@ | |||
68 | #define MACH_LEMOTE_YL2F89 4 | 68 | #define MACH_LEMOTE_YL2F89 4 |
69 | #define MACH_DEXXON_GDIUM2F10 5 | 69 | #define MACH_DEXXON_GDIUM2F10 5 |
70 | #define MACH_LEMOTE_NAS 6 | 70 | #define MACH_LEMOTE_NAS 6 |
71 | #define MACH_LOONGSON_END 7 | 71 | #define MACH_LEMOTE_LL2F 7 |
72 | #define MACH_LOONGSON_END 8 | ||
72 | 73 | ||
73 | extern char *system_type; | 74 | extern char *system_type; |
74 | const char *get_system_type(void); | 75 | const char *get_system_type(void); |
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c index d57e1f4503ad..0ed52b3f5314 100644 --- a/arch/mips/loongson/common/machtype.c +++ b/arch/mips/loongson/common/machtype.c | |||
@@ -26,6 +26,7 @@ static const char *system_types[] = { | |||
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_LEMOTE_NAS] "lemote-nas-2f", |
29 | [MACH_LEMOTE_LL2F] "lemote-lynloong-2f", | ||
29 | [MACH_LOONGSON_END] NULL, | 30 | [MACH_LOONGSON_END] NULL, |
30 | }; | 31 | }; |
31 | 32 | ||
diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c index 45601e4315d5..ea29db099aee 100644 --- a/arch/mips/loongson/common/serial.c +++ b/arch/mips/loongson/common/serial.c | |||
@@ -46,6 +46,7 @@ static struct plat_serial8250_port uart8250_data[][2] = { | |||
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_LEMOTE_NAS] {PORT_M(3), {} }, |
49 | [MACH_LEMOTE_LL2F] {PORT(3), {} }, | ||
49 | [MACH_LOONGSON_END] {}, | 50 | [MACH_LOONGSON_END] {}, |
50 | }; | 51 | }; |
51 | 52 | ||
diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c index e34d699f6f35..1d636f4f7505 100644 --- a/arch/mips/loongson/common/uart_base.c +++ b/arch/mips/loongson/common/uart_base.c | |||
@@ -24,6 +24,7 @@ unsigned long __maybe_unused uart8250_base[] = { | |||
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_LEMOTE_NAS] (LOONGSON_LIO1_BASE + 0x3f8), |
27 | [MACH_LEMOTE_LL2F] (LOONGSON_PCIIO_BASE + 0x2f8), | ||
27 | [MACH_LOONGSON_END] 0, | 28 | [MACH_LOONGSON_END] 0, |
28 | }; | 29 | }; |
29 | EXPORT_SYMBOL(uart8250_base); | 30 | EXPORT_SYMBOL(uart8250_base); |
diff --git a/arch/mips/loongson/lemote-2f/reset.c b/arch/mips/loongson/lemote-2f/reset.c index 980299dbeac3..44bb984d58dd 100644 --- a/arch/mips/loongson/lemote-2f/reset.c +++ b/arch/mips/loongson/lemote-2f/reset.c | |||
@@ -142,6 +142,7 @@ void mach_prepare_reboot(void) | |||
142 | switch (mips_machtype) { | 142 | switch (mips_machtype) { |
143 | case MACH_LEMOTE_FL2F: | 143 | case MACH_LEMOTE_FL2F: |
144 | case MACH_LEMOTE_NAS: | 144 | case MACH_LEMOTE_NAS: |
145 | case MACH_LEMOTE_LL2F: | ||
145 | fl2f_reboot(); | 146 | fl2f_reboot(); |
146 | break; | 147 | break; |
147 | case MACH_LEMOTE_ML2F7: | 148 | case MACH_LEMOTE_ML2F7: |
@@ -160,6 +161,7 @@ void mach_prepare_shutdown(void) | |||
160 | switch (mips_machtype) { | 161 | switch (mips_machtype) { |
161 | case MACH_LEMOTE_FL2F: | 162 | case MACH_LEMOTE_FL2F: |
162 | case MACH_LEMOTE_NAS: | 163 | case MACH_LEMOTE_NAS: |
164 | case MACH_LEMOTE_LL2F: | ||
163 | fl2f_shutdown(); | 165 | fl2f_shutdown(); |
164 | break; | 166 | break; |
165 | case MACH_LEMOTE_ML2F7: | 167 | case MACH_LEMOTE_ML2F7: |