Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-m68knommu / coldfire.h

diff --git a/include/asm-m68knommu/coldfire.h b/include/asm-m68knommu/coldfire.h
index 16f32cc..6190f77 100644 (file)
--- a/include/asm-m68knommu/coldfire.h
+++ b/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_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
@@ -54,6 +59,8 @@
 #define        MCF_CLK         54000000
 #elif defined(CONFIG_CLOCK_60MHz)
 #define        MCF_CLK         60000000
+#elif defined(CONFIG_CLOCK_62_5MHz)
+#define MCF_CLK                62500000
 #elif defined(CONFIG_CLOCK_64MHz)
 #define        MCF_CLK         64000000
 #elif defined(CONFIG_CLOCK_66MHz)
@@ -76,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_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