Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 645e5333 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
parent 0b2a2139

arch/m68k/include/asm/m528xsim.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -272,8 +272,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 */

arch/m68k/platform/528x/config.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

}

}





/***************************************************************************/

/***************************************************************************/