[kernel] upgrade to 2.6.25.7, and refresh patches
[openwrt.git] / target / linux / brcm63xx / patches-2.6.25 / 090-bcm963xx_remove_obsolete_timer_code.patch
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
5
6 This removes some code that has been deprecated in kernels >= 2.6.24.
7
8 Signed-off-by: Axel Gembe <ago@bastart.eu.org>
9 ---
10  arch/mips/bcm963xx/setup.c |    2 --
11  arch/mips/bcm963xx/time.c  |   29 -----------------------------
12  2 files changed, 0 insertions(+), 31 deletions(-)
13
14 --- a/arch/mips/bcm963xx/setup.c
15 +++ b/arch/mips/bcm963xx/setup.c
16 @@ -465,8 +465,6 @@
17         _machine_halt = brcm_machine_halt;
18         pm_power_off = brcm_machine_halt;
19  
20 -       //board_time_init = brcm_time_init;
21 -
22         /* mpi initialization */
23         mpi_init();
24  }
25 --- a/arch/mips/bcm963xx/time.c
26 +++ b/arch/mips/bcm963xx/time.c
27 @@ -71,26 +71,6 @@
28         return (mips_hpt_frequency / HZ);
29  }
30  
31 -
32 -/*
33 - * There are a lot of conceptually broken versions of the MIPS timer interrupt
34 - * handler floating around.  This one is rather different, but the algorithm
35 - * is provably more robust.
36 - */
37 -#if 0
38 -irqreturn_t brcm_timer_interrupt(struct pt_regs *regs)
39 -{
40 -       int irq = MIPS_TIMER_INT;
41 -
42 -       irq_enter();
43 -       kstat_this_cpu.irqs[irq]++;
44 -
45 -       timer_interrupt(irq, regs);
46 -       irq_exit();
47 -       return IRQ_HANDLED;
48 -}
49 -#endif
50 -
51  void __init plat_time_init(void)
52  {
53         unsigned int est_freq, flags;
54 @@ -107,12 +87,3 @@
55                    (est_freq % 1000000) * 100 / 1000000);
56         local_irq_restore(flags);
57  }
58 -
59 -#if 0
60 -void __init plat_timer_setup(struct irqaction *irq)
61 -{
62 -       r4k_cur = (read_c0_count() + r4k_offset);
63 -       write_c0_compare(r4k_cur);
64 -       set_c0_status(IE_IRQ5);
65 -}
66 -#endif