]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
m68knommu: fix system reset for ColdFire 527x family
authorGreg Ungerer <gerg@uclinux.org>
Tue, 28 Apr 2009 04:13:21 +0000 (14:13 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Thu, 11 Jun 2009 03:09:08 +0000 (13:09 +1000)
The sofwtare reset control for the 527x ColdFire family is based on
the same Reset Control Unit as the 528x ColdFire family. So use the
same reset code for both.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
arch/m68k/include/asm/system_no.h

index 4496c0aa83792da36f621da71936da4b09a5fbfb..5fbc96d933cef151ebc1336ef9b9886c48006771 100644 (file)
@@ -264,18 +264,18 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
        : /* No output */               \
        : "o" (*(char *)MCF_MBAR) );    \
 })
-#elif defined(CONFIG_M528x)
+#elif defined(CONFIG_M528x) || defined(CONFIG_M527x)
 /*
- * The MCF528x has a bit (SOFTRST) in memory (Reset Control Register RCR),
- * that when set, resets the MCF528x.
+ * Most of the newer ColdFire family members have a proper RESET unit.
+ * Use the software reset control bit in the Reset Control Register (RCR).
  */
 #define HARD_RESET_NOW() \
-({                                             \
-       unsigned char volatile *reset;          \
-       asm("move.w     #0x2700, %sr");         \
+({                                                                     \
+       unsigned char volatile *reset;                                  \
+       asm("move.w #0x2700, %sr");                                     \
        reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000));    \
-       while(1)                                \
-       *reset |= (0x01 << 7);\
+       while (1)                                                       \
+               *reset |= (0x01 << 7);                                  \
 })
 #elif defined(CONFIG_M523x)
 #define HARD_RESET_NOW() ({            \