diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-02-19 16:27:23 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-03-05 10:42:25 +1000 |
| commit | 320de7d01c19b6181c592fe8c69b00646ff28962 (patch) | |
| tree | 9b16c58dd15b20bc51f1a417e181feddfd43825a | |
| parent | d894b89bf74322845f776bde4d72b70b58926886 (diff) | |
m68knommu: make 523x 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>
| -rw-r--r-- | arch/m68k/include/asm/m523xsim.h | 4 | ||||
| -rw-r--r-- | arch/m68k/platform/523x/config.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h index f2d21cef094..075062d4eec 100644 --- a/arch/m68k/include/asm/m523xsim.h +++ b/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/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c index b47a6886b8a..88de2133f47 100644 --- a/arch/m68k/platform/523x/config.c +++ b/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); } /***************************************************************************/ |