1 files changed, 14 insertions, 16 deletions

diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c
index 1e1eeea73fde..9de559d58e1f 100644
--- a/arch/mips/loongson/common/uart_base.c
+++ b/arch/mips/loongson/common/uart_base.c
@@ -13,22 +13,27 @@
 
 #include <loongson.h>
 
-/* ioremapped */
-unsigned long _loongson_uart_base;
-EXPORT_SYMBOL(_loongson_uart_base);
 /* raw */
-unsigned long loongson_uart_base;
+unsigned long loongson_uart_base[MAX_UARTS] = {};
+/* ioremapped */
+unsigned long _loongson_uart_base[MAX_UARTS] = {};
+
 EXPORT_SYMBOL(loongson_uart_base);
+EXPORT_SYMBOL(_loongson_uart_base);
 
 void prom_init_loongson_uart_base(void)
 {
         switch (mips_machtype) {
+        case MACH_LOONGSON_GENERIC:
+                /* The CPU provided serial port (CPU) */
+                loongson_uart_base[0] = LOONGSON_REG_BASE + 0x1e0;
+                break;
         case MACH_LEMOTE_FL2E:
-                loongson_uart_base = LOONGSON_PCIIO_BASE + 0x3f8;
+                loongson_uart_base[0] = LOONGSON_PCIIO_BASE + 0x3f8;
                 break;
         case MACH_LEMOTE_FL2F:
         case MACH_LEMOTE_LL2F:
-                loongson_uart_base = LOONGSON_PCIIO_BASE + 0x2f8;
+                loongson_uart_base[0] = LOONGSON_PCIIO_BASE + 0x2f8;
                 break;
         case MACH_LEMOTE_ML2F7:
         case MACH_LEMOTE_YL2F89:
@@ -36,17 +41,10 @@ void prom_init_loongson_uart_base(void)
         case MACH_LEMOTE_NAS:
         default:
                 /* The CPU provided serial port (LPC) */
-                loongson_uart_base = LOONGSON_LIO1_BASE + 0x3f8;
-                break;
-        case MACH_LEMOTE_A1004:
-        case MACH_LEMOTE_A1101:
-        case MACH_LEMOTE_A1201:
-        case MACH_LEMOTE_A1205:
-                /* The CPU provided serial port (CPU) */
-                loongson_uart_base = LOONGSON_REG_BASE + 0x1e0;
+                loongson_uart_base[0] = LOONGSON_LIO1_BASE + 0x3f8;
                 break;
         }
 
-        _loongson_uart_base =
-                (unsigned long)ioremap_nocache(loongson_uart_base, 8);
+        _loongson_uart_base[0] =
+                (unsigned long)ioremap_nocache(loongson_uart_base[0], 8);
 }