On Sat, Dec 21, 2013 at 06:35:06PM +0100, John Crispin wrote: > 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 ? Since it is already inside a macro, I would say that the improvement is minor. This is the also the same pattern we have used in all include/asm/xlp-hal/ files, I cannot change it in just one place. JC.
