Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61673de1 authored Dec 21, 2013 by Jayachandran C Committed by Ralf Baechle Jan 24, 2014

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/

parent 861c0569

arch/mips/include/asm/netlogic/xlp-hal/uart.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)

arch/mips/netlogic/common/earlycons.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>