summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/uncompress.h
diff options
context:
space:
mode:
authorDavid S. Miller2010-04-21 09:50:39 +0200
committerDavid S. Miller2010-04-21 09:50:39 +0200
commite04997b13a2c2fc93af970fe95fd29a74db113e8 (patch)
treea84ec3368edc3c2568a0d6acdfa0d0e50d8cacf7 /arch/arm/plat-mxc/include/mach/uncompress.h
parentipv6: Fix tcp_v6_send_response transport header setting. (diff)
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
downloadkernel-qcow2-linux-e04997b13a2c2fc93af970fe95fd29a74db113e8.tar.gz
kernel-qcow2-linux-e04997b13a2c2fc93af970fe95fd29a74db113e8.tar.xz
kernel-qcow2-linux-e04997b13a2c2fc93af970fe95fd29a74db113e8.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/uncompress.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/uncompress.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h
index 52e476a150ca..b6d3d0fddc48 100644
--- a/arch/arm/plat-mxc/include/mach/uncompress.h
+++ b/arch/arm/plat-mxc/include/mach/uncompress.h
@@ -66,6 +66,7 @@ static inline void flush(void)
#define MX2X_UART1_BASE_ADDR 0x1000a000
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
+#define MX51_UART1_BASE_ADDR 0x73fbc000
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
@@ -101,6 +102,9 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
case MACH_TYPE_MAGX_ZN5:
uart_base = MX3X_UART2_BASE_ADDR;
break;
+ case MACH_TYPE_MX51_BABBAGE:
+ uart_base = MX51_UART1_BASE_ADDR;
+ break;
default:
break;
}