diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-02-19 16:34:58 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-03-05 10:42:27 +1000 |
| commit | 645e5333ec9088da08a1db619561de9c93c70634 (patch) | |
| tree | 40853706c6568e62159f3460a67169a6e3af88bd /arch/m68k | |
| parent | 0b2a2139056a05dde934e715739c361d8c01e523 (diff) | |
| download | linux-3.10-645e5333ec9088da08a1db619561de9c93c70634.tar.gz linux-3.10-645e5333ec9088da08a1db619561de9c93c70634.tar.bz2 linux-3.10-645e5333ec9088da08a1db619561de9c93c70634.zip | |
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>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/m528xsim.h | 4 | ||||
| -rw-r--r-- | arch/m68k/platform/528x/config.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h index e4581a4a103..569476fba18 100644 --- a/arch/m68k/include/asm/m528xsim.h +++ b/arch/m68k/include/asm/m528xsim.h @@ -272,8 +272,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/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c index 98decc6beb3..d203b1ba4eb 100644 --- a/arch/m68k/platform/528x/config.c +++ b/arch/m68k/platform/528x/config.c @@ -63,7 +63,7 @@ static void __init m528x_fec_init(void) static void m528x_cpu_reset(void) { local_irq_disable(); - __raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR); + __raw_writeb(MCF_RCR_SWRESET, MCF_RCR); } /***************************************************************************/ |