summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp/include/mach/uncompress.h
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2010-01-12 03:54:50 +0300
committerEric Miao <eric.y.miao@gmail.com>2010-03-02 02:40:53 +0300
commit9896de72d20686f4dbc9cdd64ca178c80d6838b6 (patch)
tree623929b963795e1aa498a6c01e152cb5bb19433a /arch/arm/mach-mmp/include/mach/uncompress.h
parent0925e2f0fc5a55621cb80afbb6d4543c62e6a653 (diff)
downloadlinux-9896de72d20686f4dbc9cdd64ca178c80d6838b6.tar.xz
[ARM] mmp: avengers lite (pxa168) board bring up
Signed-off-by: Gavin Gu <gavin.gu@marvell.com> Signed-off-by: Jing Xiang <jxiang@marvell.com> Signed-off-by: Jack Ren <jack.ren@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/uncompress.h')
-rw-r--r--arch/arm/mach-mmp/include/mach/uncompress.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/include/mach/uncompress.h b/arch/arm/mach-mmp/include/mach/uncompress.h
index c93d5fa5865c..a7dcc5307216 100644
--- a/arch/arm/mach-mmp/include/mach/uncompress.h
+++ b/arch/arm/mach-mmp/include/mach/uncompress.h
@@ -8,15 +8,16 @@
#include <linux/serial_reg.h>
#include <mach/addr-map.h>
+#include <asm/mach-types.h>
#define UART1_BASE (APB_PHYS_BASE + 0x36000)
#define UART2_BASE (APB_PHYS_BASE + 0x17000)
#define UART3_BASE (APB_PHYS_BASE + 0x18000)
+static volatile unsigned long *UART = (unsigned long *)UART2_BASE;
+
static inline void putc(char c)
{
- volatile unsigned long *UART = (unsigned long *)UART2_BASE;
-
/* UART enabled? */
if (!(UART[UART_IER] & UART_IER_UUE))
return;
@@ -34,8 +35,14 @@ static inline void flush(void)
{
}
+static inline void arch_decomp_setup(void)
+{
+ if (machine_is_avengers_lite())
+ UART = (unsigned long *)UART3_BASE;
+}
+
/*
* nothing to do
*/
-#define arch_decomp_setup()
+
#define arch_decomp_wdog()