diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 19:48:07 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 10:02:19 +0800 |
| commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
| tree | b1c04b25317c9dade08d911e8077c8745df8a954 /arch/arm/mach-imx/include/mach/debug-macro.S | |
| parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) | |
ARM: imx: merge plat-mxc into mach-imx
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx. It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.
To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/debug-macro.S | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/debug-macro.S b/arch/arm/mach-imx/include/mach/debug-macro.S new file mode 100644 index 000000000000..761e45f9456f --- /dev/null +++ b/arch/arm/mach-imx/include/mach/debug-macro.S @@ -0,0 +1,51 @@ +/* arch/arm/mach-imx/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. + * + */ +#include <mach/hardware.h> + +#ifdef CONFIG_DEBUG_IMX1_UART +#define UART_PADDR MX1_UART1_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX25_UART) +#define UART_PADDR MX25_UART1_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART) +#define UART_PADDR MX2x_UART1_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART) +#define UART_PADDR MX3x_UART1_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX51_UART) +#define UART_PADDR MX51_UART1_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART) +#define UART_PADDR MX53_UART1_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX6Q_UART2) +#define UART_PADDR MX6Q_UART2_BASE_ADDR +#elif defined (CONFIG_DEBUG_IMX6Q_UART4) +#define UART_PADDR MX6Q_UART4_BASE_ADDR +#endif + +#define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) + + .macro addruart, rp, rv, tmp + ldr \rp, =UART_PADDR @ physical + ldr \rv, =UART_VADDR @ virtual + .endm + + .macro senduart,rd,rx + str \rd, [\rx, #0x40] @ TXDATA + .endm + + .macro waituart,rd,rx + .endm + + .macro busyuart,rd,rx +1002: ldr \rd, [\rx, #0x98] @ SR2 + tst \rd, #1 << 3 @ TXDC + beq 1002b @ wait until transmit done + .endm |