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

Commit aca59b89 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: headers: Split debug-macro.S for mach-omap1 and mach-omap2 



This also creates the include/mach subdirectories under
mach-omap1 and mach-omap2.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 74cda9a5

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

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/* arch/arm/mach-omap1/include/mach/debug-macro.S

 *

 * Debugging macro include header

 *

 *  Copyright (C) 1994-1999 Russell King

 *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

*/



		.macro	addruart,rx

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1			@ MMU enabled?

		moveq	\rx, #0xff000000	@ physical base address

		movne	\rx, #0xfe000000	@ virtual base

		orr	\rx, \rx, #0x00fb0000

#ifdef CONFIG_OMAP_LL_DEBUG_UART3

		orr	\rx, \rx, #0x00009000	@ UART 3

#endif

#if defined(CONFIG_OMAP_LL_DEBUG_UART2) || defined(CONFIG_OMAP_LL_DEBUG_UART3)

		orr	\rx, \rx, #0x00000800	@ UART 2 & 3

#endif

		.endm



		.macro	senduart,rd,rx

		strb	\rd, [\rx]

		.endm



		.macro	busyuart,rd,rx

1001:		ldrb	\rd, [\rx, #(0x5 << 2)]	@ OMAP-1510 and friends

		and	\rd, \rd, #0x60

		teq	\rd, #0x60

		beq	1002f

		ldrb	\rd, [\rx, #(0x5 << 0)]	@ OMAP-730 only

		and	\rd, \rd, #0x60

		teq	\rd, #0x60

		bne	1001b

1002:

		.endm



		.macro	waituart,rd,rx

		.endm

arch/arm/plat-omap/include/mach/debug-macro.S→arch/arm/mach-omap2/include/mach/debug-macro.S

+2 −13
Original line number Diff line number Diff line 
/* arch/arm/plat-omap/include/mach/debug-macro.S

/* arch/arm/mach-omap2/include/mach/debug-macro.S

 *

 * Debugging macro include header

 *
@@ -14,18 +14,7 @@ 
		.macro	addruart,rx

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1			@ MMU enabled?

#ifdef CONFIG_ARCH_OMAP1

		moveq	\rx, #0xff000000	@ physical base address

		movne	\rx, #0xfe000000	@ virtual base

		orr	\rx, \rx, #0x00fb0000

#ifdef CONFIG_OMAP_LL_DEBUG_UART3

		orr	\rx, \rx, #0x00009000	@ UART 3

#endif

#if defined(CONFIG_OMAP_LL_DEBUG_UART2) || defined(CONFIG_OMAP_LL_DEBUG_UART3)

		orr	\rx, \rx, #0x00000800	@ UART 2 & 3

#endif



#elif  CONFIG_ARCH_OMAP2

#ifdef  CONFIG_ARCH_OMAP2

		moveq	\rx, #0x48000000	@ physical base address

		movne	\rx, #0xfa000000	@ virtual base

		orr	\rx, \rx, #0x0006a000