Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "This is an unusually large pull request for MIPS - in parts because
  lots of patches missed the 3.18 deadline but primarily because some
  folks opened the flood gates.

   - Retire the MIPS-specific phys_t with the generic phys_addr_t.
   - Improvments for the backtrace code used by oprofile.
   - Better backtraces on SMP systems.
   - Cleanups for the Octeon platform code.
   - Cleanups and fixes for the Loongson platform code.
   - Cleanups and fixes to the firmware library.
   - Switch ATH79 platform to use the firmware library.
   - Grand overhault to the SEAD3 and Malta interrupt code.
   - Move the GIC interrupt code to drivers/irqchip
   - Lots of GIC cleanups and updates to the GIC code to use modern IRQ
     infrastructures and features of the kernel.
   - OF documentation updates for the GIC bindings
   - Move GIC clocksource driver to drivers/clocksource
   - Merge GIC clocksource driver with clockevent driver.
   - Further updates to bring the GIC clocksource driver up to date.
   - R3000 TLB code cleanups
   - Improvments to the Loongson 3 platform code.
   - Convert pr_warning to pr_warn.
   - Merge a bunch of small lantiq and ralink fixes that have been
     staged/lingering inside the openwrt tree for a while.
   - Update archhelp for IP22/IP32
   - Fix a number of issues for Loongson 1B.
   - New clocksource and clockevent driver for Loongson 1B.
   - Further work on clk handling for Loongson 1B.
   - Platform work for Broadcom BMIPS.
   - Error handling cleanups for TurboChannel.
   - Fixes and optimization to the microMIPS support.
   - Option to disable the FTLB.
   - Dump more relevant information on machine check exception
   - Change binfmt to allow arch to examine PT_*PROC headers
   - Support for new style FPU register model in O32
   - VDSO randomization.
   - BCM47xx cleanups
   - BCM47xx reimplement the way the kernel accesses NVRAM information.
   - Random cleanups
   - Add support for ATH25 platforms
   - Remove pointless locking code in some PCI platforms.
   - Some improvments to EVA support
   - Minor Alchemy cleanup"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (185 commits)
  MIPS: Add MFHC0 and MTHC0 instructions to uasm.
  MIPS: Cosmetic cleanups of page table headers.
  MIPS: Add CP0 macros for extended EntryLo registers
  MIPS: Remove now unused definition of phys_t.
  MIPS: Replace use of phys_t with phys_addr_t.
  MIPS: Replace MIPS-specific 64BIT_PHYS_ADDR with generic PHYS_ADDR_T_64BIT
  PCMCIA: Alchemy Don't select 64BIT_PHYS_ADDR in Kconfig.
  MIPS: lib: memset: Clean up some MIPS{EL,EB} ifdefery
  MIPS: iomap: Use __mem_{read,write}{b,w,l} for MMIO
  MIPS: <asm/types.h> fix indentation.
  MAINTAINERS: Add entry for BMIPS multiplatform kernel
  MIPS: Enable VDSO randomization
  MIPS: Remove a temporary hack for debugging cache flushes in SMTC configuration
  MIPS: Remove declaration of obsolete arch_init_clk_ops()
  MIPS: atomic.h: Reformat to fit in 79 columns
  MIPS: Apply `.insn' to fixup labels throughout
  MIPS: Fix microMIPS LL/SC immediate offsets
  MIPS: Kconfig: Only allow 32-bit microMIPS builds
  MIPS: signal.c: Fix an invalid cast in ISA mode bit handling
  MIPS: mm: Only build one microassembler that is suitable
  ...

12 files changed, 136 insertions, 63 deletions

diff --git a/arch/mips/loongson/common/cs5536/cs5536_pci.c b/arch/mips/loongson/common/cs5536/cs5536_pci.c
index 81bed9d18061..b739723205f8 100644
--- a/arch/mips/loongson/common/cs5536/cs5536_pci.c
+++ b/arch/mips/loongson/common/cs5536/cs5536_pci.c
@@ -21,6 +21,7 @@
  */
 
 #include <linux/types.h>
+#include <cs5536/cs5536_pci.h>
 #include <cs5536/cs5536_vsm.h>
 
 enum {
@@ -35,21 +36,21 @@ enum {
 };
 
 static const cs5536_pci_vsm_write vsm_conf_write[] = {
-        [CS5536_ISA_FUNC]       pci_isa_write_reg,
-        [reserved_func]         NULL,
-        [CS5536_IDE_FUNC]       pci_ide_write_reg,
-        [CS5536_ACC_FUNC]       pci_acc_write_reg,
-        [CS5536_OHCI_FUNC]      pci_ohci_write_reg,
-        [CS5536_EHCI_FUNC]      pci_ehci_write_reg,
+        [CS5536_ISA_FUNC]       = pci_isa_write_reg,
+        [reserved_func]         = NULL,
+        [CS5536_IDE_FUNC]       = pci_ide_write_reg,
+        [CS5536_ACC_FUNC]       = pci_acc_write_reg,
+        [CS5536_OHCI_FUNC]      = pci_ohci_write_reg,
+        [CS5536_EHCI_FUNC]      = pci_ehci_write_reg,
 };
 
 static const cs5536_pci_vsm_read vsm_conf_read[] = {
-        [CS5536_ISA_FUNC]       pci_isa_read_reg,
-        [reserved_func]         NULL,
-        [CS5536_IDE_FUNC]       pci_ide_read_reg,
-        [CS5536_ACC_FUNC]       pci_acc_read_reg,
-        [CS5536_OHCI_FUNC]      pci_ohci_read_reg,
-        [CS5536_EHCI_FUNC]      pci_ehci_read_reg,
+        [CS5536_ISA_FUNC]       = pci_isa_read_reg,
+        [reserved_func]         = NULL,
+        [CS5536_IDE_FUNC]       = pci_ide_read_reg,
+        [CS5536_ACC_FUNC]       = pci_acc_read_reg,
+        [CS5536_OHCI_FUNC]      = pci_ohci_read_reg,
+        [CS5536_EHCI_FUNC]      = pci_ehci_read_reg,
 };
 
 /*
diff --git a/arch/mips/loongson/common/dma-swiotlb.c b/arch/mips/loongson/common/dma-swiotlb.c
index c2be01f91575..2c6b989c1bc4 100644
--- a/arch/mips/loongson/common/dma-swiotlb.c
+++ b/arch/mips/loongson/common/dma-swiotlb.c
@@ -105,11 +105,25 @@ static int loongson_dma_set_mask(struct device *dev, u64 mask)
 
 dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
+        long nid;
+#ifdef CONFIG_PHYS48_TO_HT40
+        /* We extract 2bit node id (bit 44~47, only bit 44~45 used now) from
+         * Loongson-3's 48bit address space and embed it into 40bit */
+        nid = (paddr >> 44) & 0x3;
+        paddr = ((nid << 44) ^ paddr) | (nid << 37);
+#endif
         return paddr;
 }
 
 phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
 {
+        long nid;
+#ifdef CONFIG_PHYS48_TO_HT40
+        /* We extract 2bit node id (bit 44~47, only bit 44~45 used now) from
+         * Loongson-3's 48bit address space and embed it into 40bit */
+        nid = (daddr >> 37) & 0x3;
+        daddr = ((nid << 37) ^ daddr) | (nid << 44);
+#endif
         return daddr;
 }
 
diff --git a/arch/mips/loongson/common/early_printk.c b/arch/mips/loongson/common/early_printk.c
index ced461b39069..6ca632e529dc 100644
--- a/arch/mips/loongson/common/early_printk.c
+++ b/arch/mips/loongson/common/early_printk.c
@@ -30,7 +30,7 @@ void prom_putchar(char c)
         int timeout;
         unsigned char *uart_base;
 
-        uart_base = (unsigned char *)_loongson_uart_base;
+        uart_base = (unsigned char *)_loongson_uart_base[0];
         timeout = 1024;
 
         while (((serial_in(uart_base, UART_LSR) & UART_LSR_THRE) == 0) &&
diff --git a/arch/mips/loongson/common/env.c b/arch/mips/loongson/common/env.c
index f15228550a22..045ea3d47c87 100644
--- a/arch/mips/loongson/common/env.c
+++ b/arch/mips/loongson/common/env.c
@@ -21,6 +21,7 @@
 #include <asm/bootinfo.h>
 #include <loongson.h>
 #include <boot_param.h>
+#include <workarounds.h>
 
 u32 cpu_clock_freq;
 EXPORT_SYMBOL(cpu_clock_freq);
@@ -31,7 +32,6 @@ u64 loongson_chipcfg[MAX_PACKAGES] = {0xffffffffbfc00180};
 u64 loongson_freqctrl[MAX_PACKAGES];
 
 unsigned long long smp_group[4];
-int cpuhotplug_workaround = 0;
 
 #define parse_even_earlier(res, option, p)                              \
 do {                                                                    \
@@ -67,6 +67,7 @@ void __init prom_init_env(void)
 #else
         struct boot_params *boot_p;
         struct loongson_params *loongson_p;
+        struct system_loongson *esys;
         struct efi_cpuinfo_loongson *ecpu;
         struct irq_source_routing_table *eirq_source;
 
@@ -74,6 +75,8 @@ void __init prom_init_env(void)
         boot_p = (struct boot_params *)fw_arg2;
         loongson_p = &(boot_p->efi.smbios.lp);
 
+        esys = (struct system_loongson *)
+                ((u64)loongson_p + loongson_p->system_offset);
         ecpu = (struct efi_cpuinfo_loongson *)
                 ((u64)loongson_p + loongson_p->cpu_offset);
         eirq_source = (struct irq_source_routing_table *)
@@ -95,6 +98,7 @@ void __init prom_init_env(void)
                 loongson_chipcfg[2] = 0x900020001fe00180;
                 loongson_chipcfg[3] = 0x900030001fe00180;
                 loongson_sysconf.ht_control_base = 0x90000EFDFB000000;
+                loongson_sysconf.workarounds = WORKAROUND_CPUFREQ;
         } else if (ecpu->cputype == Loongson_3B) {
                 loongson_sysconf.cores_per_node = 4; /* One chip has 2 nodes */
                 loongson_sysconf.cores_per_package = 8;
@@ -111,7 +115,7 @@ void __init prom_init_env(void)
                 loongson_freqctrl[2] = 0x900040001fe001d0;
                 loongson_freqctrl[3] = 0x900060001fe001d0;
                 loongson_sysconf.ht_control_base = 0x90001EFDFB000000;
-                cpuhotplug_workaround = 1;
+                loongson_sysconf.workarounds = WORKAROUND_CPUHOTPLUG;
         } else {
                 loongson_sysconf.cores_per_node = 1;
                 loongson_sysconf.cores_per_package = 1;
@@ -119,6 +123,8 @@ void __init prom_init_env(void)
         }
 
         loongson_sysconf.nr_cpus = ecpu->nr_cpus;
+        loongson_sysconf.boot_cpu_id = ecpu->cpu_startup_core_id;
+        loongson_sysconf.reserved_cpus_mask = ecpu->reserved_cores_mask;
         if (ecpu->nr_cpus > NR_CPUS || ecpu->nr_cpus == 0)
                 loongson_sysconf.nr_cpus = NR_CPUS;
         loongson_sysconf.nr_nodes = (loongson_sysconf.nr_cpus +
@@ -141,6 +147,24 @@ void __init prom_init_env(void)
         pr_debug("Shutdown Addr: %llx, Restart Addr: %llx, VBIOS Addr: %llx\n",
                 loongson_sysconf.poweroff_addr, loongson_sysconf.restart_addr,
                 loongson_sysconf.vgabios_addr);
+
+        memset(loongson_sysconf.ecname, 0, 32);
+        if (esys->has_ec)
+                memcpy(loongson_sysconf.ecname, esys->ec_name, 32);
+        loongson_sysconf.workarounds |= esys->workarounds;
+
+        loongson_sysconf.nr_uarts = esys->nr_uarts;
+        if (esys->nr_uarts < 1 || esys->nr_uarts > MAX_UARTS)
+                loongson_sysconf.nr_uarts = 1;
+        memcpy(loongson_sysconf.uarts, esys->uarts,
+                sizeof(struct uart_device) * loongson_sysconf.nr_uarts);
+
+        loongson_sysconf.nr_sensors = esys->nr_sensors;
+        if (loongson_sysconf.nr_sensors > MAX_SENSORS)
+                loongson_sysconf.nr_sensors = 0;
+        if (loongson_sysconf.nr_sensors)
+                memcpy(loongson_sysconf.sensors, esys->sensors,
+                        sizeof(struct sensor_device) * loongson_sysconf.nr_sensors);
 #endif
         if (cpu_clock_freq == 0) {
                 processor_id = (&current_cpu_data)->processor_id;
diff --git a/arch/mips/loongson/common/gpio.c b/arch/mips/loongson/common/gpio.c
index 21869908aaa4..29dbaa253061 100644
--- a/arch/mips/loongson/common/gpio.c
+++ b/arch/mips/loongson/common/gpio.c
@@ -37,7 +37,7 @@ int gpio_get_value(unsigned gpio)
         val = LOONGSON_GPIODATA;
         spin_unlock(&gpio_lock);
 
-        return ((val & mask) != 0);
+        return (val & mask) != 0;
 }
 EXPORT_SYMBOL(gpio_get_value);
 
diff --git a/arch/mips/loongson/common/init.c b/arch/mips/loongson/common/init.c
index f6af3aba4c86..9b987fe98b5b 100644
--- a/arch/mips/loongson/common/init.c
+++ b/arch/mips/loongson/common/init.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/bootmem.h>
+#include <asm/bootinfo.h>
 #include <asm/smp-ops.h>
 
 #include <loongson.h>
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 1a4797984b8d..f2807bc662a3 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -19,19 +19,16 @@
 #define MACHTYPE_LEN 50
 
 static const char *system_types[] = {
-        [MACH_LOONGSON_UNKNOWN]         "unknown loongson machine",
-        [MACH_LEMOTE_FL2E]              "lemote-fuloong-2e-box",
-        [MACH_LEMOTE_FL2F]              "lemote-fuloong-2f-box",
-        [MACH_LEMOTE_ML2F7]             "lemote-mengloong-2f-7inches",
-        [MACH_LEMOTE_YL2F89]            "lemote-yeeloong-2f-8.9inches",
-        [MACH_DEXXON_GDIUM2F10]         "dexxon-gdium-2f",
-        [MACH_LEMOTE_NAS]               "lemote-nas-2f",
-        [MACH_LEMOTE_LL2F]              "lemote-lynloong-2f",
-        [MACH_LEMOTE_A1004]             "lemote-3a-notebook-a1004",
-        [MACH_LEMOTE_A1101]             "lemote-3a-itx-a1101",
-        [MACH_LEMOTE_A1201]             "lemote-2gq-notebook-a1201",
-        [MACH_LEMOTE_A1205]             "lemote-2gq-aio-a1205",
-        [MACH_LOONGSON_END]             NULL,
+        [MACH_LOONGSON_UNKNOWN] = "unknown loongson machine",
+        [MACH_LEMOTE_FL2E]      = "lemote-fuloong-2e-box",
+        [MACH_LEMOTE_FL2F]      = "lemote-fuloong-2f-box",
+        [MACH_LEMOTE_ML2F7]     = "lemote-mengloong-2f-7inches",
+        [MACH_LEMOTE_YL2F89]    = "lemote-yeeloong-2f-8.9inches",
+        [MACH_DEXXON_GDIUM2F10] = "dexxon-gdium-2f",
+        [MACH_LEMOTE_NAS]       = "lemote-nas-2f",
+        [MACH_LEMOTE_LL2F]      = "lemote-lynloong-2f",
+        [MACH_LOONGSON_GENERIC] = "generic-loongson-machine",
+        [MACH_LOONGSON_END]     = NULL,
 };
 
 const char *get_system_type(void)
diff --git a/arch/mips/loongson/common/rtc.c b/arch/mips/loongson/common/rtc.c
index a90d87c01555..b5709af09f7f 100644
--- a/arch/mips/loongson/common/rtc.c
+++ b/arch/mips/loongson/common/rtc.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/mc146818rtc.h>
 
-struct resource loongson_rtc_resources[] = {
+static struct resource loongson_rtc_resources[] = {
         {
                 .start  = RTC_PORT(0),
                 .end    = RTC_PORT(1),
diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c
index bd2b7095b6dc..c23fa1373729 100644
--- a/arch/mips/loongson/common/serial.c
+++ b/arch/mips/loongson/common/serial.c
@@ -38,20 +38,17 @@
         .regshift       = 0,                                    \
 }
 
-static struct plat_serial8250_port uart8250_data[][2] = {
-        [MACH_LOONGSON_UNKNOWN]         {},
-        [MACH_LEMOTE_FL2E]              {PORT(4, 1843200), {} },
-        [MACH_LEMOTE_FL2F]              {PORT(3, 1843200), {} },
-        [MACH_LEMOTE_ML2F7]             {PORT_M(3, 3686400), {} },
-        [MACH_LEMOTE_YL2F89]            {PORT_M(3, 3686400), {} },
-        [MACH_DEXXON_GDIUM2F10]         {PORT_M(3, 3686400), {} },
-        [MACH_LEMOTE_NAS]               {PORT_M(3, 3686400), {} },
-        [MACH_LEMOTE_LL2F]              {PORT(3, 1843200), {} },
-        [MACH_LEMOTE_A1004]             {PORT_M(2, 33177600), {} },
-        [MACH_LEMOTE_A1101]             {PORT_M(2, 25000000), {} },
-        [MACH_LEMOTE_A1201]             {PORT_M(2, 25000000), {} },
-        [MACH_LEMOTE_A1205]             {PORT_M(2, 25000000), {} },
-        [MACH_LOONGSON_END]             {},
+static struct plat_serial8250_port uart8250_data[][MAX_UARTS + 1] = {
+        [MACH_LOONGSON_UNKNOWN] = {},
+        [MACH_LEMOTE_FL2E]      = {PORT(4, 1843200), {} },
+        [MACH_LEMOTE_FL2F]      = {PORT(3, 1843200), {} },
+        [MACH_LEMOTE_ML2F7]     = {PORT_M(3, 3686400), {} },
+        [MACH_LEMOTE_YL2F89]    = {PORT_M(3, 3686400), {} },
+        [MACH_DEXXON_GDIUM2F10] = {PORT_M(3, 3686400), {} },
+        [MACH_LEMOTE_NAS]       = {PORT_M(3, 3686400), {} },
+        [MACH_LEMOTE_LL2F]      = {PORT(3, 1843200), {} },
+        [MACH_LOONGSON_GENERIC] = {PORT_M(2, 25000000), {} },
+        [MACH_LOONGSON_END]     = {},
 };
 
 static struct platform_device uart8250_device = {
@@ -61,17 +58,52 @@ static struct platform_device uart8250_device = {
 
 static int __init serial_init(void)
 {
+        int i;
         unsigned char iotype;
 
         iotype = uart8250_data[mips_machtype][0].iotype;
 
-        if (UPIO_MEM == iotype)
+        if (UPIO_MEM == iotype) {
+                uart8250_data[mips_machtype][0].mapbase =
+                        loongson_uart_base[0];
                 uart8250_data[mips_machtype][0].membase =
-                        (void __iomem *)_loongson_uart_base;
+                        (void __iomem *)_loongson_uart_base[0];
+        }
         else if (UPIO_PORT == iotype)
                 uart8250_data[mips_machtype][0].iobase =
-                    loongson_uart_base - LOONGSON_PCIIO_BASE;
+                        loongson_uart_base[0] - LOONGSON_PCIIO_BASE;
 
+        if (loongson_sysconf.uarts[0].uartclk)
+                uart8250_data[mips_machtype][0].uartclk =
+                        loongson_sysconf.uarts[0].uartclk;
+
+        for (i = 1; i < loongson_sysconf.nr_uarts; i++) {
+                iotype = loongson_sysconf.uarts[i].iotype;
+                uart8250_data[mips_machtype][i].iotype = iotype;
+                loongson_uart_base[i] = loongson_sysconf.uarts[i].uart_base;
+
+                if (UPIO_MEM == iotype) {
+                        uart8250_data[mips_machtype][i].irq =
+                                MIPS_CPU_IRQ_BASE + loongson_sysconf.uarts[i].int_offset;
+                        uart8250_data[mips_machtype][i].mapbase =
+                                loongson_uart_base[i];
+                        uart8250_data[mips_machtype][i].membase =
+                                ioremap_nocache(loongson_uart_base[i], 8);
+                } else if (UPIO_PORT == iotype) {
+                        uart8250_data[mips_machtype][i].irq =
+                                loongson_sysconf.uarts[i].int_offset;
+                        uart8250_data[mips_machtype][i].iobase =
+                                loongson_uart_base[i] - LOONGSON_PCIIO_BASE;
+                }
+
+                uart8250_data[mips_machtype][i].uartclk =
+                        loongson_sysconf.uarts[i].uartclk;
+                uart8250_data[mips_machtype][i].flags =
+                        UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
+        }
+
+        memset(&uart8250_data[mips_machtype][loongson_sysconf.nr_uarts],
+                        0, sizeof(struct plat_serial8250_port));
         uart8250_device.dev.platform_data = uart8250_data[mips_machtype];
 
         return platform_device_register(&uart8250_device);
diff --git a/arch/mips/loongson/common/setup.c b/arch/mips/loongson/common/setup.c
index bb4ac922e47a..d477dd6bb326 100644
--- a/arch/mips/loongson/common/setup.c
+++ b/arch/mips/loongson/common/setup.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 
 #include <asm/wbflush.h>
+#include <asm/bootinfo.h>
 
 #include <loongson.h>
 
diff --git a/arch/mips/loongson/common/time.c b/arch/mips/loongson/common/time.c
index 262a1f65b05e..e1a5382ad47e 100644
--- a/arch/mips/loongson/common/time.c
+++ b/arch/mips/loongson/common/time.c
@@ -12,6 +12,7 @@
  */
 #include <asm/mc146818-time.h>
 #include <asm/time.h>
+#include <asm/hpet.h>
 
 #include <loongson.h>
 #include <cs5536/cs5536_mfgpt.h>
@@ -21,7 +22,11 @@ void __init plat_time_init(void)
         /* setup mips r4k timer */
         mips_hpt_frequency = cpu_clock_freq / 2;
 
+#ifdef CONFIG_RS780_HPET
+        setup_hpet_timer();
+#else
         setup_mfgpt0_timer();
+#endif
 }
 
 void read_persistent_clock(struct timespec *ts)
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);
 }