m68knommu: move ColdFire slice timer address defiens to 54xx header

Move the base address defines of the ColdFire 54xx CPU slice timers into the
54xx specific header (m54xxsim.h). They are CPU specific, and belong with the
CPU specific defines. Also make them relative to the MBAR peripheral region,
making the define the absolute address.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

3 files changed, 8 insertions, 9 deletions

diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h
index d3c5e0dbdadf..d6a50799ff27 100644
--- a/arch/m68k/include/asm/m54xxsim.h
+++ b/arch/m68k/include/asm/m54xxsim.h
@@ -47,6 +47,12 @@
 #define MCF_IRQ_UART3           (MCFINT_VECBASE + 32)
 
 /*
+ *      Slice Timer support.
+ */
+#define MCFSLT_TIMER0           (MCF_MBAR + 0x900)      /* Base addr TIMER0 */
+#define MCFSLT_TIMER1           (MCF_MBAR + 0x910)      /* Base addr TIMER1 */
+
+/*
  *      Generic GPIO support
  */
 #define MCFGPIO_PIN_MAX         0       /* I am too lazy to count */
diff --git a/arch/m68k/include/asm/mcfslt.h b/arch/m68k/include/asm/mcfslt.h
index d0d0ecba5333..c2314b6f8caa 100644
--- a/arch/m68k/include/asm/mcfslt.h
+++ b/arch/m68k/include/asm/mcfslt.h
@@ -13,13 +13,6 @@
 /****************************************************************************/
 
 /*
- *      Get address specific defines for the 547x.
- */
-#define MCFSLT_TIMER0           0x900   /* Base address of TIMER0 */
-#define MCFSLT_TIMER1           0x910   /* Base address of TIMER1 */
-
-
-/*
  *      Define the SLT timer register set addresses.
  */
 #define MCFSLT_STCNT            0x00    /* Terminal count */
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c
index 2027fc20b876..bb5a25ada848 100644
--- a/arch/m68k/platform/coldfire/sltimers.c
+++ b/arch/m68k/platform/coldfire/sltimers.c
@@ -32,7 +32,7 @@
 /*
  *      By default use Slice Timer 1 as the profiler clock timer.
  */
-#define PA(a)   (MCF_MBAR + MCFSLT_TIMER1 + (a))
+#define PA(a)   (MCFSLT_TIMER1 + (a))
 
 /*
  *      Choose a reasonably fast profile timer. Make it an odd value to
@@ -76,7 +76,7 @@ void mcfslt_profile_init(void)
 /*
  *      By default use Slice Timer 0 as the system clock timer.
  */
-#define TA(a)   (MCF_MBAR + MCFSLT_TIMER0 + (a))
+#define TA(a)   (MCFSLT_TIMER0 + (a))
 
 static u32 mcfslt_cycles_per_jiffy;
 static u32 mcfslt_cnt;