Commit 0b2a2139 authored by Greg Ungerer's avatar Greg Ungerer

m68knommu: make 527x CPU reset register addressing consistent

If we make all MCF_RCR (CPU reset register) addressing consistent across all
ColdFire CPU family members that use it then we will be able to remove the
duplicated copies of the code that use it.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 320de7d0
...@@ -328,8 +328,8 @@ ...@@ -328,8 +328,8 @@
/* /*
* Reset Control Unit (relative to IPSBAR). * Reset Control Unit (relative to IPSBAR).
*/ */
#define MCF_RCR 0x110000 #define MCF_RCR (MCF_IPSBAR + 0x110000)
#define MCF_RSR 0x110001 #define MCF_RSR (MCF_IPSBAR + 0x110001)
#define MCF_RCR_SWRESET 0x80 /* Software reset bit */ #define MCF_RCR_SWRESET 0x80 /* Software reset bit */
#define MCF_RCR_FRCSTOUT 0x40 /* Force external reset */ #define MCF_RCR_FRCSTOUT 0x40 /* Force external reset */
......
...@@ -90,7 +90,7 @@ static void __init m527x_fec_init(void) ...@@ -90,7 +90,7 @@ static void __init m527x_fec_init(void)
static void m527x_cpu_reset(void) static void m527x_cpu_reset(void)
{ {
local_irq_disable(); local_irq_disable();
__raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR); __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
} }
/***************************************************************************/ /***************************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment