diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-26 08:43:32 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-29 15:35:34 -0400 |
commit | ba5eac515f73910744c5d9f8fc1c5d6548cf6ff4 (patch) | |
tree | ea25263fe3271773c1ad7b031e15d13b4efcd267 /arch/mips/lasat/setup.c | |
parent | da349bef9700e0dbf69e4273fa87c476c46c454f (diff) |
[MIPS] time: Merge lasat plat_timer_setup into plat_time_init.
Since the cp0 compare interrupt handler isn't initialized by the time
plat_time_init is called don't set IE_IRQ5 anymore, cevt-r4k.c will do
that a little later itself.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/lasat/setup.c')
-rw-r--r-- | arch/mips/lasat/setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index 54827d0174bf..e072da4ff3b3 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
@@ -117,14 +117,11 @@ static struct notifier_block lasat_panic_block[] = | |||
117 | } | 117 | } |
118 | }; | 118 | }; |
119 | 119 | ||
120 | void plat_time_init(void) | 120 | void __init plat_time_init(void) |
121 | { | 121 | { |
122 | mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2; | 122 | mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2; |
123 | } | ||
124 | 123 | ||
125 | void __init plat_timer_setup(struct irqaction *irq) | 124 | change_c0_status(ST0_IM, IE_IRQ0); |
126 | { | ||
127 | change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); | ||
128 | } | 125 | } |
129 | 126 | ||
130 | void __init plat_mem_setup(void) | 127 | void __init plat_mem_setup(void) |