From: John Crispin <john@phrozen.org>
To: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Subject: Re: [PATCH 12/18] MIPS: Netlogic: XLP9XX UART offset
Date: Sat, 21 Dec 2013 18:35:06 +0100 [thread overview]
Message-ID: <52B5D14A.3030504@phrozen.org> (raw)
In-Reply-To: <1387624950-31297-13-git-send-email-jchandra@broadcom.com>
On 21/12/13 12:22, Jayachandran C wrote:
> Update IO offset of the early console UART.
>
> Signed-off-by: Jayachandran C<jchandra@broadcom.com>
> ---
> 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>
next prev parent reply other threads:[~2013-12-21 17:37 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-21 11:22 [PATCH 00/18] Broadcom XLP Updates for 3.14 Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 01/18] MIPS: Netlogic: Add MSI support for XLP Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 02/18] MIPS: Netlogic: Add topology.h for XLP family Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 03/18] MIPS: Netlogic: Some cleanups for assembly code Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 04/18] MIPS: Netlogic: L1D cacheflush before thread enable on XLPII Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 05/18] MIPS: Netlogic: Add macro for node present Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 06/18] MIPS: Netlogic: Get coremask from FUSE register Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 07/18] MIPS: Netlogic: Core wakeup improvements Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 08/18] MIPS: Netlogic: Identify XLP 9XX chip Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 09/18] MIPS: Netlogic: update iomap.h for XLP9XX Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 10/18] MIPS: Netlogic: XLP9XX PIC updates Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 11/18] MIPS: Netlogic: SYS block updates of XLP9XX Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 12/18] MIPS: Netlogic: XLP9XX UART offset Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 17:35 ` John Crispin [this message]
2013-12-25 7:07 ` Jayachandran C.
2013-12-25 7:07 ` Jayachandran C.
2013-12-21 11:22 ` [PATCH 13/18] MIPS: Netlogic: XLP9XX bridge and DRAM code Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 14/18] MIPS: Netlogic: Add cpu to node mapping for XLP9XX Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 15/18] MIPS: PCI: Netlogic XLP9XX support Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 16/18] MIPS: Netlogic: XLP9XX USB support Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 17/18] MIPS: Netlogic: XLP9XX PIC OF support Jayachandran C
2013-12-21 11:22 ` Jayachandran C
2013-12-21 11:22 ` [PATCH 18/18] MIPS: Netlogic: Add default DTB for XLP9XX SoC Jayachandran C
2013-12-21 11:22 ` Jayachandran C
-- strict thread matches above, loose matches on Subject: below --
2013-10-14 13:20 [PATCH 00/18] Broadcom XLP Updates Jayachandran C
2013-10-14 13:21 ` [PATCH 12/18] MIPS: Netlogic: XLP9XX UART offset Jayachandran C
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52B5D14A.3030504@phrozen.org \
--to=john@phrozen.org \
--cc=jchandra@broadcom.com \
--cc=linux-mips@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.