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>

diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h
index d3c5e0dbdadf7359b3d5539e8ea1ce5282b624db..d6a50799ff27a12becb57bdd876e8f6aca917bec 100644 (file)
--- a/arch/m68k/include/asm/m54xxsim.h
+++ b/arch/m68k/include/asm/m54xxsim.h
@@ -46,6 +46,12 @@
 #define MCF_IRQ_UART2          (MCFINT_VECBASE + 33)
 #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
  */

diff --git a/arch/m68k/include/asm/mcfslt.h b/arch/m68k/include/asm/mcfslt.h
index d0d0ecba533307c91608d70dcbc2ba5acc8d6755..c2314b6f8caa82b3135bfda004fd6ea016ed3d39 100644 (file)
--- a/arch/m68k/include/asm/mcfslt.h
+++ b/arch/m68k/include/asm/mcfslt.h
@@ -12,13 +12,6 @@
 #define mcfslt_h
 /****************************************************************************/
 
-/*
- *     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.
  */

diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c
index 2027fc20b8761eeb099a218fed8522ea9159fa06..bb5a25ada84872420e1ac518e85ac647dc5aa818 100644 (file)
--- 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;