aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-05-19 01:00:01 -0400
committerGreg Ungerer <gerg@uclinux.org>2009-09-15 19:43:52 -0400
commitf6a66276f5fdc018d2a9378c71de3bae13c588d7 (patch)
tree5a6148447a9d7b379e31fc4d0b6ddedcc189f80a /arch/m68knommu
parent04b75b10dceadf937e3707ecc3dfccf6a076fd29 (diff)
m68knommu: clean up ColdFire 532x CPU timer setup
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 <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/platform/532x/config.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c
index 66e212b58b85..d632948e64e5 100644
--- a/arch/m68knommu/platform/532x/config.c
+++ b/arch/m68knommu/platform/532x/config.c
@@ -30,12 +30,6 @@
30 30
31/***************************************************************************/ 31/***************************************************************************/
32 32
33extern unsigned int mcf_timervector;
34extern unsigned int mcf_profilevector;
35extern unsigned int mcf_timerlevel;
36
37/***************************************************************************/
38
39static struct mcf_platform_uart m532x_uart_platform[] = { 33static struct mcf_platform_uart m532x_uart_platform[] = {
40 { 34 {
41 .mapbase = MCFUART_BASE1, 35 .mapbase = MCFUART_BASE1,
@@ -87,6 +81,7 @@ static struct platform_device m532x_fec = {
87 .num_resources = ARRAY_SIZE(m532x_fec_resources), 81 .num_resources = ARRAY_SIZE(m532x_fec_resources),
88 .resource = m532x_fec_resources, 82 .resource = m532x_fec_resources,
89}; 83};
84
90static struct platform_device *m532x_devices[] __initdata = { 85static struct platform_device *m532x_devices[] __initdata = {
91 &m532x_uart, 86 &m532x_uart,
92 &m532x_fec, 87 &m532x_fec,
@@ -126,12 +121,6 @@ static void __init m532x_fec_init(void)
126 121
127/***************************************************************************/ 122/***************************************************************************/
128 123
129void mcf_settimericr(unsigned int timer, unsigned int level)
130{
131}
132
133/***************************************************************************/
134
135static void m532x_cpu_reset(void) 124static void m532x_cpu_reset(void)
136{ 125{
137 local_irq_disable(); 126 local_irq_disable();
@@ -153,10 +142,6 @@ void __init config_BSP(char *commandp, int size)
153 } 142 }
154#endif 143#endif
155 144
156 mcf_timervector = 64+32;
157 mcf_profilevector = 64+33;
158 mach_reset = m532x_cpu_reset;
159
160#ifdef CONFIG_BDM_DISABLE 145#ifdef CONFIG_BDM_DISABLE
161 /* 146 /*
162 * Disable the BDM clocking. This also turns off most of the rest of 147 * Disable the BDM clocking. This also turns off most of the rest of