1 From 42ecc15386869684cf29881a3a6941bafaa3bf69 Mon Sep 17 00:00:00 2001
2 From: Axel Gembe <ago@bastart.eu.org>
3 Date: Wed, 14 May 2008 00:25:28 +0200
4 Subject: [PATCH] bcm963xx: remove obsolete timer code
6 This removes some code that has been deprecated in kernels >= 2.6.24.
8 Signed-off-by: Axel Gembe <ago@bastart.eu.org>
10 arch/mips/bcm963xx/setup.c | 2 --
11 arch/mips/bcm963xx/time.c | 29 -----------------------------
12 2 files changed, 0 insertions(+), 31 deletions(-)
14 Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
15 ===================================================================
16 --- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
17 +++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
18 @@ -465,8 +465,6 @@ void __init plat_mem_setup(void)
19 _machine_halt = brcm_machine_halt;
20 pm_power_off = brcm_machine_halt;
22 - //board_time_init = brcm_time_init;
24 /* mpi initialization */
27 Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
28 ===================================================================
29 --- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
30 +++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
31 @@ -71,26 +71,6 @@ static inline unsigned long __init cal_r
32 return (mips_hpt_frequency / HZ);
37 - * There are a lot of conceptually broken versions of the MIPS timer interrupt
38 - * handler floating around. This one is rather different, but the algorithm
39 - * is provably more robust.
42 -irqreturn_t brcm_timer_interrupt(struct pt_regs *regs)
44 - int irq = MIPS_TIMER_INT;
47 - kstat_this_cpu.irqs[irq]++;
49 - timer_interrupt(irq, regs);
55 void __init plat_time_init(void)
57 unsigned int est_freq, flags;
58 @@ -107,12 +87,3 @@ void __init plat_time_init(void)
59 (est_freq % 1000000) * 100 / 1000000);
60 local_irq_restore(flags);
64 -void __init plat_timer_setup(struct irqaction *irq)
66 - r4k_cur = (read_c0_count() + r4k_offset);
67 - write_c0_compare(r4k_cur);
68 - set_c0_status(IE_IRQ5);