diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-04-28 08:56:03 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-06-11 05:09:09 +0200 |
| commit | 293ca0f75415dd8373c716bf9755569daca7ba5d (patch) | |
| tree | 6c853bed92928fffe52cfe9f1a765899aa14c46d /arch/m68k | |
| parent | m68knommu: fix system reset for ColdFire 527x family (diff) | |
| download | linux-293ca0f75415dd8373c716bf9755569daca7ba5d.tar.xz linux-293ca0f75415dd8373c716bf9755569daca7ba5d.zip | |
m68knommu: merge system reset for code ColdFire 523x family
The sofwtare reset control code for the 523x ColdFire family uses the
same Reset unit hardware as the 527x and 528x ColdFire parts. So they
should all use the same code. Merge them.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/system_no.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/m68k/include/asm/system_no.h b/arch/m68k/include/asm/system_no.h index 5fbc96d933ce..a0a1ae8b1524 100644 --- a/arch/m68k/include/asm/system_no.h +++ b/arch/m68k/include/asm/system_no.h @@ -264,7 +264,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz : /* No output */ \ : "o" (*(char *)MCF_MBAR) ); \ }) -#elif defined(CONFIG_M528x) || defined(CONFIG_M527x) +#elif defined(CONFIG_M523x) || defined(CONFIG_M528x) || defined(CONFIG_M527x) /* * Most of the newer ColdFire family members have a proper RESET unit. * Use the software reset control bit in the Reset Control Register (RCR). @@ -275,16 +275,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz asm("move.w #0x2700, %sr"); \ reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000)); \ while (1) \ - *reset |= (0x01 << 7); \ -}) -#elif defined(CONFIG_M523x) -#define HARD_RESET_NOW() ({ \ - asm(" \ - movew #0x2700, %sr; \ - movel #0x01000000, %sp; \ - moveal #0x40110000, %a0; \ - moveb #0x80, (%a0); \ - "); \ + *reset |= 0x80; \ }) #elif defined(CONFIG_M520x) /* |