From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] ARM: plat-omap: make OMAP_UART_INFO into a relative offset
Date: Mon, 5 Sep 2011 02:44:14 -0700 [thread overview]
Message-ID: <20110905094414.GA1903@atomide.com> (raw)
In-Reply-To: <1314932353-24813-3-git-send-email-nico@fluxnic.net>
* Nicolas Pitre <nico@fluxnic.net> [110901 19:27]:
> --- a/arch/arm/mach-omap1/include/mach/debug-macro.S
> +++ b/arch/arm/mach-omap1/include/mach/debug-macro.S
> @@ -46,11 +46,9 @@ omap_uart_virt: .word 0x0
> bne 99f @ already configured
>
> /* Check the debug UART configuration set in uncompress.h */
> - mrc p15, 0, \rp, c1, c0
> - tst \rp, #1 @ MMU enabled?
> - ldreq \rp, =OMAP_UART_INFO @ MMU not enabled
> - ldrne \rp, =omap_uart_p2v(OMAP_UART_INFO) @ MMU enabled
> - ldr \rp, [\rp, #0]
> + and \rp, pc, #0xff000000
> + ldr \rv, =OMAP_UART_INFO_OFS
> + ldr \rp, [\rp, \rv]
>
> /* Select the UART to use based on the UART1 scratchpad value */
> 10: cmp \rp, #0 @ no port configured?
> --- a/arch/arm/mach-omap2/include/mach/debug-macro.S
> +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
> @@ -49,11 +49,10 @@ omap_uart_lsr: .word 0
> bne 99f @ already configured
>
> /* Check the debug UART configuration set in uncompress.h */
> - mrc p15, 0, \rp, c1, c0
> - tst \rp, #1 @ MMU enabled?
> - ldreq \rp, =OMAP_UART_INFO @ MMU not enabled
> - ldrne \rp, =omap_uart_p2v(OMAP_UART_INFO) @ MMU enabled
> - ldr \rp, [\rp, #0]
> + mov \rp, pc
> + ldr \rv, =OMAP_UART_INFO_OFS
> + and \rp, \rp, #0xff000000
> + ldr \rp, [\rp, \rv]
>
> /* Select the UART to use based on the UART1 scratchpad value */
> cmp \rp, #0 @ no port configured?
Any reason to not make it the same for omap1 and omap2+?
It seems to work both ways, but the omap1 version is one line less
of code :)
Other than that:
Tested-by: Tony Lindgren <tony@atomide.com>
next prev parent reply other threads:[~2011-09-05 9:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-02 2:59 [PATCH 0/6] OMAP/Davinci debug UART code cleanup Nicolas Pitre
2011-09-02 2:59 ` [PATCH 1/6] ARM: add an extra temp register to the addruart low level debugging macro Nicolas Pitre
2011-09-02 2:59 ` [PATCH 2/6] ARM: plat-omap: make OMAP_UART_INFO into a relative offset Nicolas Pitre
2011-09-05 9:44 ` Tony Lindgren [this message]
2011-09-05 19:24 ` Nicolas Pitre
2011-09-05 9:46 ` [PATCH 2.5/6] ARM: omap: prepare debug-macro.S for offset based calculation of omap_uart_phys and virt Tony Lindgren
2011-09-06 18:30 ` Nicolas Pitre
2011-09-02 2:59 ` [PATCH 3/6] ARM: mach-omap1: clean up debug-macro.S Nicolas Pitre
2011-09-05 9:49 ` Tony Lindgren
2011-09-05 9:51 ` Tony Lindgren
2011-09-06 18:33 ` Nicolas Pitre
2011-09-02 2:59 ` [PATCH 4/6] ARM: mach-omap2: " Nicolas Pitre
2011-09-05 9:51 ` Tony Lindgren
2011-09-05 15:07 ` [PATCH 4.5/6] ARM: omap: pass phys, virt and lsr from uncompress.h to debug-macro.S Tony Lindgren
2011-09-06 18:45 ` Nicolas Pitre
2011-09-02 2:59 ` [PATCH 5/6] ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset Nicolas Pitre
2011-09-02 2:59 ` [PATCH 6/6] ARM: mach-davinci: clean up debug-macro.S Nicolas Pitre
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=20110905094414.GA1903@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).