From 3a9bb50449f2cf4b82e17c5b037bb66113023eea Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Wed, 2 Nov 2005 14:59:09 +1000
Subject: [PATCH] --- yaml --- r: 12123 b: refs/heads/master c:
 7ee2cf5f43e8fefa53cf6f32ba8205cce962a348 h: refs/heads/master i:   12121:
 4574aba9c5484c2900dc90b45a1540e3731c9a72   12119:
 47cfa775771a2b041d3daf598bf00fa19a950053 v: v3

---
 [refs]                                 |  2 +-
 trunk/include/asm-m68knommu/coldfire.h | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 90bf3e9d7b68..9edbf03483a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed65fa16d54a015ef0855692901a6cf362046622
+refs/heads/master: 7ee2cf5f43e8fefa53cf6f32ba8205cce962a348
diff --git a/trunk/include/asm-m68knommu/coldfire.h b/trunk/include/asm-m68knommu/coldfire.h
index 1df3f666a28e..6190f77b1e6c 100644
--- a/trunk/include/asm-m68knommu/coldfire.h
+++ b/trunk/include/asm-m68knommu/coldfire.h
@@ -20,9 +20,14 @@
  */
 #define	MCF_MBAR	0x10000000
 #define	MCF_MBAR2	0x80000000
+#if defined(CONFIG_M520x)
+#define	MCF_IPSBAR	0xFC000000
+#else
 #define	MCF_IPSBAR	0x40000000
+#endif
 
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
+    defined(CONFIG_M520x)
 #undef MCF_MBAR
 #define	MCF_MBAR	MCF_IPSBAR
 #endif
@@ -78,7 +83,8 @@
  *	One some ColdFire family members the bus clock (used by internal
  *	peripherals) is not the same as the CPU clock.
  */
-#if defined(CONFIG_M523x) || defined(CONFIG_M5249) || defined(CONFIG_M527x)
+#if defined(CONFIG_M523x) || defined(CONFIG_M5249) || defined(CONFIG_M527x) || \
+    defined(CONFIG_M520x)
 #define	MCF_BUSCLK	(MCF_CLK / 2)
 #else
 #define	MCF_BUSCLK	MCF_CLK