Re: [PATCH 12/18] MIPS: Netlogic: XLP9XX UART offset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 21/12/13 12:22, Jayachandran C wrote:
Update IO offset of the early console UART.

Signed-off-by: Jayachandran C<jchandra@xxxxxxxxxxxx>
---
  arch/mips/include/asm/netlogic/xlp-hal/uart.h |    3 ++-
  arch/mips/netlogic/common/earlycons.c         |    2 ++
  2 files changed, 4 insertions(+), 1 deletion(-)

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

nitpick: i think this looks really ugly. maybe move the ()?():() logic to a define ?





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



[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux