From 51b7ae1076d4dd689b0e828a6f4fafd8bc5dbea3 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sun, 19 Feb 2012 16:33:11 +1000 Subject: [PATCH] --- yaml --- r: 292455 b: refs/heads/master c: 0b2a2139056a05dde934e715739c361d8c01e523 h: refs/heads/master i: 292453: 433ea55b4b150dd139f997fdbb5654dc84766ce0 292451: 16699a1765a16eba7b6476030b42ffea75d43d51 292447: 83f61b5f1b023fc796ef6bae559ce7665749826a v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/m527xsim.h | 4 ++-- trunk/arch/m68k/platform/527x/config.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6827d5fbe245..8dd6e87437bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 320de7d01c19b6181c592fe8c69b00646ff28962 +refs/heads/master: 0b2a2139056a05dde934e715739c361d8c01e523 diff --git a/trunk/arch/m68k/include/asm/m527xsim.h b/trunk/arch/m68k/include/asm/m527xsim.h index f1c5b2c8d447..83db8106f50a 100644 --- a/trunk/arch/m68k/include/asm/m527xsim.h +++ b/trunk/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/trunk/arch/m68k/platform/527x/config.c b/trunk/arch/m68k/platform/527x/config.c index 9bdf522d9f08..38655051bf59 100644 --- a/trunk/arch/m68k/platform/527x/config.c +++ b/trunk/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); } /***************************************************************************/