1 files changed, 16 insertions, 15 deletions

diff --git a/arch/mips/netlogic/xlr/platform.c b/arch/mips/netlogic/xlr/platform.c
index 609ec253464..eab64b45dff 100644
--- a/arch/mips/netlogic/xlr/platform.c
+++ b/arch/mips/netlogic/xlr/platform.c
@@ -15,18 +15,19 @@
 #include <linux/serial_8250.h>
 #include <linux/serial_reg.h>
 
+#include <asm/netlogic/haldefs.h>
 #include <asm/netlogic/xlr/iomap.h>
 #include <asm/netlogic/xlr/pic.h>
 #include <asm/netlogic/xlr/xlr.h>
 
 unsigned int nlm_xlr_uart_in(struct uart_port *p, int offset)
 {
-        nlm_reg_t *mmio;
+        uint64_t uartbase;
         unsigned int value;
 
-        /* XLR uart does not need any mapping of regs */
-        mmio = (nlm_reg_t *)(p->membase + (offset << p->regshift));
-        value = netlogic_read_reg(mmio, 0);
+        /* sign extend to 64 bits, if needed */
+        uartbase = (uint64_t)(long)p->membase;
+        value = nlm_read_reg(uartbase, offset);
 
         /* See XLR/XLS errata */
         if (offset == UART_MSR)
@@ -39,10 +40,10 @@ unsigned int nlm_xlr_uart_in(struct uart_port *p, int offset)
 
 void nlm_xlr_uart_out(struct uart_port *p, int offset, int value)
 {
-        nlm_reg_t *mmio;
+        uint64_t uartbase;
 
-        /* XLR uart does not need any mapping of regs */
-        mmio = (nlm_reg_t *)(p->membase + (offset << p->regshift));
+        /* sign extend to 64 bits, if needed */
+        uartbase = (uint64_t)(long)p->membase;
 
         /* See XLR/XLS errata */
         if (offset == UART_MSR)
@@ -50,7 +51,7 @@ void nlm_xlr_uart_out(struct uart_port *p, int offset, int value)
         else if (offset == UART_MCR)
                 value ^= 0x3;
 
-        netlogic_write_reg(mmio, 0, value);
+        nlm_write_reg(uartbase, offset, value);
 }
 
 #define PORT(_irq)                                      \
@@ -82,15 +83,15 @@ static struct platform_device uart_device = {
 
 static int __init nlm_uart_init(void)
 {
-        nlm_reg_t *mmio;
+        unsigned long uartbase;
 
-        mmio = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);
-        xlr_uart_data[0].membase = (void __iomem *)mmio;
-        xlr_uart_data[0].mapbase = CPHYSADDR((unsigned long)mmio);
+        uartbase = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);
+        xlr_uart_data[0].membase = (void __iomem *)uartbase;
+        xlr_uart_data[0].mapbase = CPHYSADDR(uartbase);
 
-        mmio = netlogic_io_mmio(NETLOGIC_IO_UART_1_OFFSET);
-        xlr_uart_data[1].membase = (void __iomem *)mmio;
-        xlr_uart_data[1].mapbase = CPHYSADDR((unsigned long)mmio);
+        uartbase = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_1_OFFSET);
+        xlr_uart_data[1].membase = (void __iomem *)uartbase;
+        xlr_uart_data[1].mapbase = CPHYSADDR(uartbase);
 
         return platform_device_register(&uart_device);
 }