From dab343ff529b83eee20cd5638dcf90eb76188d82 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sun, 19 Feb 2012 16:27:23 +1000 Subject: [PATCH] --- yaml --- r: 292454 b: refs/heads/master c: 320de7d01c19b6181c592fe8c69b00646ff28962 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/m523xsim.h | 4 ++-- trunk/arch/m68k/platform/523x/config.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0928aacbbc93..6827d5fbe245 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d894b89bf74322845f776bde4d72b70b58926886 +refs/heads/master: 320de7d01c19b6181c592fe8c69b00646ff28962 diff --git a/trunk/arch/m68k/include/asm/m523xsim.h b/trunk/arch/m68k/include/asm/m523xsim.h index f2d21cef094c..075062d4eecd 100644 --- a/trunk/arch/m68k/include/asm/m523xsim.h +++ b/trunk/arch/m68k/include/asm/m523xsim.h @@ -65,8 +65,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/trunk/arch/m68k/platform/523x/config.c b/trunk/arch/m68k/platform/523x/config.c index b47a6886b8ae..88de2133f47d 100644 --- a/trunk/arch/m68k/platform/523x/config.c +++ b/trunk/arch/m68k/platform/523x/config.c @@ -57,7 +57,7 @@ static void __init m523x_fec_init(void) static void m523x_cpu_reset(void) { local_irq_disable(); - __raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR); + __raw_writeb(MCF_RCR_SWRESET, MCF_RCR); } /***************************************************************************/