Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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/
Jayachandran C 11 years ago
parent
861c056953
commit
61673de131
2 changed files with 4 additions and 1 deletions
Split View Show Diff Stats
  1. 2 1
      arch/mips/include/asm/netlogic/xlp-hal/uart.h
  2. 2 0
      arch/mips/netlogic/common/earlycons.c

+ 2 - 1
arch/mips/include/asm/netlogic/xlp-hal/uart.h
View File 

@@ -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)

+ 2 - 0
arch/mips/netlogic/common/earlycons.c
View File 

@@ -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>