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

Commit 639da5ee authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: add an extra temp register to the low level debugging addruart macro 



Some platforms (like OMAP not to name it) are doing rather complicated
hacks just to determine the base UART address to use.  Let's give their
addruart macro some slack by providing an extra work register which will
allow for much needed cleanups.

This is basically a no-op as this commit is only adding the extra argument
to the macro but no one is using it yet.

Signed-off-by: default avatarnicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
parent 57c89707

arch/arm/kernel/debug.S

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#if defined(CONFIG_DEBUG_ICEDCC)

		@@ debug using ARM EmbeddedICE DCC channel



		.macro	addruart, rp, rv

		.macro	addruart, rp, rv, tmp

		.endm



#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
@@ -106,7 +106,7 @@ 


#ifdef CONFIG_MMU

		.macro	addruart_current, rx, tmp1, tmp2

		addruart	\tmp1, \tmp2

		addruart	\tmp1, \tmp2, \rx

		mrc		p15, 0, \rx, c1, c0

		tst		\rx, #1

		moveq		\rx, \tmp1

arch/arm/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ __create_page_tables: 
	 * This allows debug messages to be output

	 * via a serial console before paging_init.

	 */

	addruart r7, r3

	addruart r7, r3, r0



	mov	r3, r3, lsr #20

	mov	r3, r3, lsl #2

arch/arm/mach-at91/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <mach/hardware.h>

#include <mach/at91_dbgu.h>



	.macro	addruart, rp, rv

	.macro	addruart, rp, rv, tmp

	ldr	\rp, =(AT91_BASE_SYS + AT91_DBGU)	@ System peripherals (phys address)

	ldr	\rv, =(AT91_VA_BASE_SYS	+ AT91_DBGU)	@ System peripherals (virt address)

	.endm

arch/arm/mach-clps711x/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <mach/hardware.h>

#include <asm/hardware/clps7111.h>



		.macro	addruart, rp, rv

		.macro	addruart, rp, rv, tmp

#ifndef CONFIG_DEBUG_CLPS711X_UART2

		mov	\rp, #0x0000	@ UART1

#else

arch/arm/mach-cns3xxx/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * published by the Free Software Foundation.

 */



		.macro	addruart,rp,rv

		.macro	addruart,rp,rv,tmp

		mov	\rp, #0x00009000

		orr	\rv, \rp, #0xf0000000	@ virtual base

		orr	\rp, \rp, #0x10000000