diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-18 13:51:15 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-18 18:11:47 +0100 |
| commit | 89742e5376adee9f26756f5d2573ae2b18fb2a96 (patch) | |
| tree | b3c466807a11b3ec992284b842c881f3d829a41b /arch/mips/jazz | |
| parent | e887b24592c5ddf46d37e592b2ee6bd2188257e1 (diff) | |
| download | op-kernel-dev-89742e5376adee9f26756f5d2573ae2b18fb2a96.zip op-kernel-dev-89742e5376adee9f26756f5d2573ae2b18fb2a96.tar.gz | |
[MIPS] Jazz: Retire use of plat_timer_setup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/jazz')
| -rw-r--r-- | arch/mips/jazz/irq.c | 6 | ||||
| -rw-r--r-- | arch/mips/jazz/setup.c | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 835b056..ae25b48 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c @@ -4,7 +4,7 @@ * for more details. * * Copyright (C) 1992 Linus Torvalds - * Copyright (C) 1994 - 2001, 2003 Ralf Baechle + * Copyright (C) 1994 - 2001, 2003, 07 Ralf Baechle */ #include <linux/clockchips.h> #include <linux/init.h> @@ -13,6 +13,7 @@ #include <linux/spinlock.h> #include <asm/irq_cpu.h> +#include <asm/i8253.h> #include <asm/i8259.h> #include <asm/io.h> #include <asm/jazz.h> @@ -136,7 +137,7 @@ static struct irqaction r4030_timer_irqaction = { .name = "timer", }; -void __init plat_timer_setup(struct irqaction *ignored) +void __init plat_time_init(void) { struct irqaction *irq = &r4030_timer_irqaction; @@ -152,4 +153,5 @@ void __init plat_timer_setup(struct irqaction *ignored) setup_irq(JAZZ_TIMER_IRQ, irq); clockevents_register_device(&r4030_clockevent); + setup_pit_timer(); } diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index cfc7dce..a785797 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -5,7 +5,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle + * Copyright (C) 1996, 1997, 1998, 2001, 07 by Ralf Baechle * Copyright (C) 2001 MIPS Technologies, Inc. * Copyright (C) 2007 by Thomas Bogendoerfer */ @@ -25,7 +25,6 @@ #include <linux/serial_8250.h> #include <asm/bootinfo.h> -#include <asm/i8253.h> #include <asm/irq.h> #include <asm/jazz.h> #include <asm/jazzdma.h> @@ -64,11 +63,6 @@ static struct resource jazz_io_resources[] = { } }; -void __init plat_time_init(void) -{ - setup_pit_timer(); -} - void __init plat_mem_setup(void) { int i; |
