Skip to content

Commit

Permalink
m68knommu: clean up ColdFire 532x CPU timer setup
Browse files Browse the repository at this point in the history
The newer ColdFire 532x family of CPU's uses the old timer, but has a
newer interrupt controller. It doesn't need the special timer setup
that was required when using the older interrupt controller. Remove the
dead timer irq and level setting code, and define the hard coded vector.

Signed-off-by: Greg Ungerer <[email protected]>
  • Loading branch information
gregungerer committed Sep 15, 2009
1 parent 04b75b1 commit f6a6627
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
5 changes: 5 additions & 0 deletions arch/m68k/include/asm/m532xsim.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
#define MCFSIM_ICR_TIMER1 (0xFC048040+32)
#define MCFSIM_ICR_TIMER2 (0xFC048040+33)

/*
* Define system peripheral IRQ usage.
*/
#define MCF_IRQ_TIMER (64 + 32) /* Timer0 */
#define MCF_IRQ_PROFILER (64 + 33) /* Timer1 */

/*
* Define the Cache register flags.
Expand Down
17 changes: 1 addition & 16 deletions arch/m68knommu/platform/532x/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@

/***************************************************************************/

extern unsigned int mcf_timervector;
extern unsigned int mcf_profilevector;
extern unsigned int mcf_timerlevel;

/***************************************************************************/

static struct mcf_platform_uart m532x_uart_platform[] = {
{
.mapbase = MCFUART_BASE1,
Expand Down Expand Up @@ -87,6 +81,7 @@ static struct platform_device m532x_fec = {
.num_resources = ARRAY_SIZE(m532x_fec_resources),
.resource = m532x_fec_resources,
};

static struct platform_device *m532x_devices[] __initdata = {
&m532x_uart,
&m532x_fec,
Expand Down Expand Up @@ -126,12 +121,6 @@ static void __init m532x_fec_init(void)

/***************************************************************************/

void mcf_settimericr(unsigned int timer, unsigned int level)
{
}

/***************************************************************************/

static void m532x_cpu_reset(void)
{
local_irq_disable();
Expand All @@ -153,10 +142,6 @@ void __init config_BSP(char *commandp, int size)
}
#endif

mcf_timervector = 64+32;
mcf_profilevector = 64+33;
mach_reset = m532x_cpu_reset;

#ifdef CONFIG_BDM_DISABLE
/*
* Disable the BDM clocking. This also turns off most of the rest of
Expand Down

0 comments on commit f6a6627

Please sign in to comment.