Commit d9eec1a5 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle

[MIPS] time: Code cleanups

* Do not include unnecessary headers.
* Do not mention time.README.
* Do not mention mips_timer_ack.
* Make clocksource_mips static.  It is now dedicated to c0_timer.
* Initialize clocksource_mips.read statically.
* Remove null_hpt_read.
* Remove an argument of plat_timer_setup.  It is just a placeholder.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1d0a909c
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
* Author: Jun Sun, jsun@mvista.com or jsun@junsun.net * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
* Copyright (c) 2003, 2004 Maciej W. Rozycki * Copyright (c) 2003, 2004 Maciej W. Rozycki
* *
* Common time service routines for MIPS machines. See * Common time service routines for MIPS machines.
* Documentation/mips/time.README.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
...@@ -18,28 +17,17 @@ ...@@ -18,28 +17,17 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/profile.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/kernel_stat.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kallsyms.h>
#include <asm/bootinfo.h>
#include <asm/cache.h>
#include <asm/compiler.h>
#include <asm/cpu.h>
#include <asm/cpu-features.h> #include <asm/cpu-features.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/sections.h>
#include <asm/smtc_ipi.h> #include <asm/smtc_ipi.h>
#include <asm/time.h> #include <asm/time.h>
#include <irq.h>
/* /*
* forward reference * forward reference
*/ */
...@@ -62,14 +50,6 @@ int update_persistent_clock(struct timespec now) ...@@ -62,14 +50,6 @@ int update_persistent_clock(struct timespec now)
return rtc_mips_set_mmss(now.tv_sec); return rtc_mips_set_mmss(now.tv_sec);
} }
/*
* Null high precision timer functions for systems lacking one.
*/
static cycle_t null_hpt_read(void)
{
return 0;
}
/* /*
* High precision timer functions for a R4k-compatible timer. * High precision timer functions for a R4k-compatible timer.
*/ */
...@@ -104,6 +84,13 @@ EXPORT_SYMBOL(perf_irq); ...@@ -104,6 +84,13 @@ EXPORT_SYMBOL(perf_irq);
unsigned int mips_hpt_frequency; unsigned int mips_hpt_frequency;
static struct clocksource clocksource_mips = {
.name = "MIPS",
.read = c0_hpt_read,
.mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
static unsigned int __init calibrate_hpt(void) static unsigned int __init calibrate_hpt(void)
{ {
cycle_t frequency, hpt_start, hpt_end, hpt_count, hz; cycle_t frequency, hpt_start, hpt_end, hpt_count, hz;
...@@ -146,12 +133,6 @@ static unsigned int __init calibrate_hpt(void) ...@@ -146,12 +133,6 @@ static unsigned int __init calibrate_hpt(void)
return frequency >> log_2_loops; return frequency >> log_2_loops;
} }
struct clocksource clocksource_mips = {
.name = "MIPS",
.mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock) void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock)
{ {
u64 temp; u64 temp;
...@@ -187,9 +168,6 @@ void __cpuinit clockevent_set_clock(struct clock_event_device *cd, ...@@ -187,9 +168,6 @@ void __cpuinit clockevent_set_clock(struct clock_event_device *cd,
static void __init init_mips_clocksource(void) static void __init init_mips_clocksource(void)
{ {
if (!mips_hpt_frequency || clocksource_mips.read == null_hpt_read)
return;
/* Calclate a somewhat reasonable rating value */ /* Calclate a somewhat reasonable rating value */
clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000; clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000;
...@@ -211,7 +189,7 @@ void __init __weak plat_time_init(void) ...@@ -211,7 +189,7 @@ void __init __weak plat_time_init(void)
* setup_irq calls and each clock_event_device should use its own * setup_irq calls and each clock_event_device should use its own
* struct irqrequest. * struct irqrequest.
*/ */
void __init plat_timer_setup(struct irqaction *irq) void __init plat_timer_setup(void)
{ {
BUG(); BUG();
} }
...@@ -220,21 +198,8 @@ void __init time_init(void) ...@@ -220,21 +198,8 @@ void __init time_init(void)
{ {
plat_time_init(); plat_time_init();
/* Choose appropriate high precision timer routines. */ if (cpu_has_counter && (mips_hpt_frequency || mips_timer_state)) {
if (!cpu_has_counter && !clocksource_mips.read)
/* No high precision timer -- sorry. */
clocksource_mips.read = null_hpt_read;
else if (!mips_hpt_frequency && !mips_timer_state) {
/* A high precision timer of unknown frequency. */
if (!clocksource_mips.read)
/* No external high precision timer -- use R4k. */
clocksource_mips.read = c0_hpt_read;
} else {
/* We know counter frequency. Or we can get it. */ /* We know counter frequency. Or we can get it. */
if (!clocksource_mips.read) {
/* No external high precision timer -- use R4k. */
clocksource_mips.read = c0_hpt_read;
}
if (!mips_hpt_frequency) if (!mips_hpt_frequency)
mips_hpt_frequency = calibrate_hpt(); mips_hpt_frequency = calibrate_hpt();
...@@ -242,8 +207,8 @@ void __init time_init(void) ...@@ -242,8 +207,8 @@ void __init time_init(void)
printk("Using %u.%03u MHz high precision timer.\n", printk("Using %u.%03u MHz high precision timer.\n",
((mips_hpt_frequency + 500) / 1000) / 1000, ((mips_hpt_frequency + 500) / 1000) / 1000,
((mips_hpt_frequency + 500) / 1000) % 1000); ((mips_hpt_frequency + 500) / 1000) % 1000);
init_mips_clocksource();
} }
init_mips_clocksource();
mips_clockevent_init(); mips_clockevent_init();
} }
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/i8259.h> #include <asm/i8259.h>
......
...@@ -10,15 +10,10 @@ ...@@ -10,15 +10,10 @@
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*
* Please refer to Documentation/mips/time.README.
*/ */
#ifndef _ASM_TIME_H #ifndef _ASM_TIME_H
#define _ASM_TIME_H #define _ASM_TIME_H
#include <linux/interrupt.h>
#include <linux/linkage.h>
#include <linux/ptrace.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
...@@ -38,20 +33,12 @@ extern int rtc_mips_set_mmss(unsigned long); ...@@ -38,20 +33,12 @@ extern int rtc_mips_set_mmss(unsigned long);
/* /*
* Timer interrupt functions. * Timer interrupt functions.
* mips_timer_state is needed for high precision timer calibration. * mips_timer_state is needed for high precision timer calibration.
* mips_timer_ack may be NULL if the interrupt is self-recoverable.
*/ */
extern int (*mips_timer_state)(void); extern int (*mips_timer_state)(void);
/*
* High precision timer clocksource.
* If .read is NULL, an R4k-compatible timer setup is attempted.
*/
extern struct clocksource clocksource_mips;
/* /*
* board specific routines required by time_init(). * board specific routines required by time_init().
*/ */
struct irqaction;
extern void plat_time_init(void); extern void plat_time_init(void);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment