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

diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index f1c5b2c8d44718201c9aa59e1c98a6d2ef630450..83db8106f50ae81502ad613c02f5c288786df2b3 100644 (file)
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -328,8 +328,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/527x/config.c b/arch/m68k/platform/527x/config.c
index 9bdf522d9f0822ec536e54a0282971395b657c08..38655051bf59f8e40f38d25b128b53081da17fc4 100644 (file)
--- a/arch/m68k/platform/527x/config.c
+++ b/arch/m68k/platform/527x/config.c
@@ -90,7 +90,7 @@ static void __init m527x_fec_init(void)
 static void m527x_cpu_reset(void)
 {
        local_irq_disable();
-       __raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR);
+       __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
 }
 
 /***************************************************************************/