diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-03-09 09:57:14 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-03-15 21:01:54 +1000 |
| commit | 58f0ac98f386d2b335e5852e8feec828c43a0e13 (patch) | |
| tree | e5155ca33386026a9d0b7b2e0de00514f76fd295 /arch/m68knommu | |
| parent | babc08b7e953cd23e10d175d546309dedadaabea (diff) | |
| download | kernel_samsung_smdk4412-58f0ac98f386d2b335e5852e8feec828c43a0e13.zip kernel_samsung_smdk4412-58f0ac98f386d2b335e5852e8feec828c43a0e13.tar.gz kernel_samsung_smdk4412-58f0ac98f386d2b335e5852e8feec828c43a0e13.tar.bz2 | |
m68knommu: remove use of MBAR in old-style ColdFire timer
Not all ColdFire CPUs that use the old style timer hardware module use
an MBAR set peripheral region. Move the TIMER base address defines to the
per-CPU header files where we can set it correctly based on how the
peripherals are mapped - instead of using a fake MBAR for some platforms.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/platform/coldfire/timers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/coldfire/timers.c b/arch/m68knommu/platform/coldfire/timers.c index 2304d73..60242f6 100644 --- a/arch/m68knommu/platform/coldfire/timers.c +++ b/arch/m68knommu/platform/coldfire/timers.c @@ -28,7 +28,7 @@ * By default use timer1 as the system clock timer. */ #define FREQ (MCF_BUSCLK / 16) -#define TA(a) (MCF_MBAR + MCFTIMER_BASE1 + (a)) +#define TA(a) (MCFTIMER_BASE1 + (a)) /* * These provide the underlying interrupt vector support. @@ -126,7 +126,7 @@ void hw_timer_init(void) /* * By default use timer2 as the profiler clock timer. */ -#define PA(a) (MCF_MBAR + MCFTIMER_BASE2 + (a)) +#define PA(a) (MCFTIMER_BASE2 + (a)) /* * Choose a reasonably fast profile timer. Make it an odd value to |