Explorar o código

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>
Greg Ungerer %!s(int64=13) %!d(string=hai) anos
pai
achega
0b2a213905
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 2 2
      arch/m68k/include/asm/m527xsim.h
  2. 1 1
      arch/m68k/platform/527x/config.c

+ 2 - 2
arch/m68k/include/asm/m527xsim.h

@@ -328,8 +328,8 @@
 /*
 /*
  *  Reset Control Unit (relative to IPSBAR).
  *  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_SWRESET		0x80		/* Software reset bit */
 #define	MCF_RCR_FRCSTOUT	0x40		/* Force external reset */
 #define	MCF_RCR_FRCSTOUT	0x40		/* Force external reset */

+ 1 - 1
arch/m68k/platform/527x/config.c

@@ -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);
 }
 }
 
 
 /***************************************************************************/
 /***************************************************************************/