diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-26 13:52:41 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-29 19:35:34 +0000 |
| commit | e0511f75246df404e72fc1376967253d2f460c34 (patch) | |
| tree | 4de9db3e7433ff26e0deab98addce314e32f291f /arch/mips/basler | |
| parent | ba5eac515f73910744c5d9f8fc1c5d6548cf6ff4 (diff) | |
| download | linux-3.10-e0511f75246df404e72fc1376967253d2f460c34.tar.gz linux-3.10-e0511f75246df404e72fc1376967253d2f460c34.tar.bz2 linux-3.10-e0511f75246df404e72fc1376967253d2f460c34.zip | |
[MIPS] time: Merge eXcite plat_timer_setup into plat_time_init.
Fixme: At the time of this writing cevt-r4k.c doesn't yet know about how
to handle the alternate timer interrupt of the RM9000.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/basler')
| -rw-r--r-- | arch/mips/basler/excite/excite_setup.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c index 404ca9284b3..24378b9223f 100644 --- a/arch/mips/basler/excite/excite_setup.c +++ b/arch/mips/basler/excite/excite_setup.c @@ -68,24 +68,23 @@ DEFINE_SPINLOCK(titan_lock); int titan_irqflags; +/* + * The eXcite platform uses the alternate timer interrupt + * + * Fixme: At the time of this writing cevt-r4k.c doesn't yet know about how + * to handle the alternate timer interrupt of the RM9000. + */ void __init plat_time_init(void) { const u32 modebit5 = ocd_readl(0x00e4); - unsigned int - mult = ((modebit5 >> 11) & 0x1f) + 2, - div = ((modebit5 >> 16) & 0x1f) + 2; + unsigned int mult = ((modebit5 >> 11) & 0x1f) + 2, + unsigned int div = ((modebit5 >> 16) & 0x1f) + 2; - if (div == 33) div = 1; + if (div == 33) + div = 1; mips_hpt_frequency = EXCITE_CPU_EXT_CLOCK * mult / div / 2; } -void __init plat_timer_setup(struct irqaction *irq) -{ - /* The eXcite platform uses the alternate timer interrupt */ - set_c0_intcontrol(0x80); - setup_irq(TIMER_IRQ, irq); -} - static int __init excite_init_console(void) { #if defined(CONFIG_SERIAL_8250) |