diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-18 11:27:07 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-18 11:27:07 +0000 |
commit | 8213084125eed3c5efbc5e13739b93dfedb88590 (patch) | |
tree | b98d91de82a4a39a47c6031832271341ecf5e8e0 /include/asm-arm/arch-ns9xxx/debug-macro.S | |
parent | 66822b2eef8de9fe3ec9fa837386817565dbe690 (diff) | |
parent | b77bfa84c419e3ec8b8e3fd4b4579e5761b7c943 (diff) |
Merge NetSilicon NS93xx tree
Fixed conflicts:
arch/arm/Makefile
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-ns9xxx/debug-macro.S')
-rw-r--r-- | include/asm-arm/arch-ns9xxx/debug-macro.S | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ns9xxx/debug-macro.S b/include/asm-arm/arch-ns9xxx/debug-macro.S new file mode 100644 index 000000000000..b21b93eb2dbc --- /dev/null +++ b/include/asm-arm/arch-ns9xxx/debug-macro.S @@ -0,0 +1,22 @@ +/* + * include/asm-arm/arch-ns9xxx/debug-macro.S + * Copyright (C) 2006 by Digi International Inc. + * All rights reserved. + * + * 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 <asm/hardware.h> + +#include <asm/arch-ns9xxx/regs-board-a9m9750dev.h> + + .macro addruart,rx + mrc p15, 0, \rx, c1, c0 + tst \rx, #1 + ldreq \rx, =NS9XXX_CSxSTAT_PHYS(0) + ldrne \rx, =io_p2v(NS9XXX_CSxSTAT_PHYS(0)) + .endm + +#define UART_SHIFT 2 +#include <asm/hardware/debug-8250.S> |