m68knommu: make 528x 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: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h
index e4581a4a10359f365e97ed8721018d1449008982..569476fba18cc522a3bcc2ede85671eb0787786e 100644 (file)
--- a/arch/m68k/include/asm/m528xsim.h
+++ b/arch/m68k/include/asm/m528xsim.h
@@ -272,8 +272,8 @@
 /*
  *  Reset Control Unit (relative to IPSBAR).
  */
-#define        MCF_RCR                 0x110000
-#define        MCF_RSR                 0x110001
+#define        MCF_RCR                 (MCF_IPSBAR + 0x110000)
+#define        MCF_RSR                 (MCF_IPSBAR + 0x110001)
 
 #define        MCF_RCR_SWRESET         0x80            /* Software reset bit */
 #define        MCF_RCR_FRCSTOUT        0x40            /* Force external reset */

diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
index 98decc6beb341fe904125825c4938250cd6b8431..d203b1ba4ebb78d9f7621b6b3c0f49ad9e16d5aa 100644 (file)
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/528x/config.c
@@ -63,7 +63,7 @@ static void __init m528x_fec_init(void)
 static void m528x_cpu_reset(void)
 {
        local_irq_disable();
-       __raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR);
+       __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
 }
 
 /***************************************************************************/