浏览代码

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>
Greg Ungerer 13 年之前
父节点
当前提交
645e5333ec
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      arch/m68k/include/asm/m528xsim.h
  2. 1 1
      arch/m68k/platform/528x/config.c

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

@@ -272,8 +272,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/528x/config.c

@@ -63,7 +63,7 @@ static void __init m528x_fec_init(void)
 static void m528x_cpu_reset(void)
 static void m528x_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);
 }
 }
 
 
 /***************************************************************************/
 /***************************************************************************/