diff options
| author | Jayachandran C <jchandra@broadcom.com> | 2013-12-21 11:22:24 (GMT) |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-01-24 21:39:48 (GMT) |
| commit | 61673de131f9bf1bace63a5e58ab683a0e5313fd (patch) | |
| tree | bee21a73f460ad8a3ed527ca379521d5160336f9 /arch | |
| parent | 861c056953dc4354414881a5e1d382297ef4ea53 (diff) | |
| download | linux-61673de131f9bf1bace63a5e58ab683a0e5313fd.tar.xz | |
MIPS: Netlogic: XLP9XX UART offset
Update IO offset of the early console UART.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6281/
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/include/asm/netlogic/xlp-hal/uart.h | 3 | ||||
| -rw-r--r-- | arch/mips/netlogic/common/earlycons.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/uart.h b/arch/mips/include/asm/netlogic/xlp-hal/uart.h index 86d16e1..a6c5442 100644 --- a/arch/mips/include/asm/netlogic/xlp-hal/uart.h +++ b/arch/mips/include/asm/netlogic/xlp-hal/uart.h @@ -94,7 +94,8 @@ #define nlm_read_uart_reg(b, r) nlm_read_reg(b, r) #define nlm_write_uart_reg(b, r, v) nlm_write_reg(b, r, v) #define nlm_get_uart_pcibase(node, inst) \ - nlm_pcicfg_base(XLP_IO_UART_OFFSET(node, inst)) + nlm_pcicfg_base(cpu_is_xlp9xx() ? XLP9XX_IO_UART_OFFSET(node) : \ + XLP_IO_UART_OFFSET(node, inst)) #define nlm_get_uart_regbase(node, inst) \ (nlm_get_uart_pcibase(node, inst) + XLP_IO_PCI_HDRSZ) diff --git a/arch/mips/netlogic/common/earlycons.c b/arch/mips/netlogic/common/earlycons.c index 1902fa2..769f930 100644 --- a/arch/mips/netlogic/common/earlycons.c +++ b/arch/mips/netlogic/common/earlycons.c @@ -37,9 +37,11 @@ #include <asm/mipsregs.h> #include <asm/netlogic/haldefs.h> +#include <asm/netlogic/common.h> #if defined(CONFIG_CPU_XLP) #include <asm/netlogic/xlp-hal/iomap.h> +#include <asm/netlogic/xlp-hal/xlp.h> #include <asm/netlogic/xlp-hal/uart.h> #elif defined(CONFIG_CPU_XLR) #include <asm/netlogic/xlr/iomap.h> |