diff options
-rw-r--r-- | Documentation/mips/time.README | 10 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/sim/sim_time.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/mips/time.README b/Documentation/mips/time.README index 69ddc5c14b79..e1304b6bc483 100644 --- a/Documentation/mips/time.README +++ b/Documentation/mips/time.README | |||
@@ -63,7 +63,7 @@ the following functions or values: | |||
63 | a) board_time_init - a function pointer. Invoked at the beginnig of | 63 | a) board_time_init - a function pointer. Invoked at the beginnig of |
64 | time_init(). It is optional. | 64 | time_init(). It is optional. |
65 | 1. (optional) set up RTC routines | 65 | 1. (optional) set up RTC routines |
66 | 2. (optional) calibrate and set the mips_counter_frequency | 66 | 2. (optional) calibrate and set the mips_hpt_frequency |
67 | 67 | ||
68 | b) plat_timer_setup - a function pointer. Invoked at the end of time_init() | 68 | b) plat_timer_setup - a function pointer. Invoked at the end of time_init() |
69 | 1. (optional) over-ride any decisions made in time_init() | 69 | 1. (optional) over-ride any decisions made in time_init() |
@@ -72,7 +72,7 @@ the following functions or values: | |||
72 | 72 | ||
73 | c) (optional) board-specific RTC routines. | 73 | c) (optional) board-specific RTC routines. |
74 | 74 | ||
75 | d) (optional) mips_counter_frequency - It must be definied if the board | 75 | d) (optional) mips_hpt_frequency - It must be definied if the board |
76 | is using CPU counter for timer interrupt or it is using fixed rate | 76 | is using CPU counter for timer interrupt or it is using fixed rate |
77 | gettimeoffset(). | 77 | gettimeoffset(). |
78 | 78 | ||
@@ -104,7 +104,7 @@ Step 1: decide how you like to implement the time services. | |||
104 | or use an exnternal timer? | 104 | or use an exnternal timer? |
105 | 105 | ||
106 | In order to use CPU counter register as the timer interrupt source, you | 106 | In order to use CPU counter register as the timer interrupt source, you |
107 | must know the counter speed (mips_counter_frequency). It is usually the | 107 | must know the counter speed (mips_hpt_frequency). It is usually the |
108 | same as the CPU speed or an integral divisor of it. | 108 | same as the CPU speed or an integral divisor of it. |
109 | 109 | ||
110 | d) decide on whether you want to use high-level or low-level timer | 110 | d) decide on whether you want to use high-level or low-level timer |
@@ -121,8 +121,8 @@ Step 3: implement rtc routines, board_time_init() and plat_timer_setup() | |||
121 | if needed. | 121 | if needed. |
122 | 122 | ||
123 | board_time_init() - | 123 | board_time_init() - |
124 | a) (optional) set up RTC routines, | 124 | a) (optional) set up RTC routines, |
125 | b) (optional) calibrate and set the mips_counter_frequency | 125 | b) (optional) calibrate and set the mips_hpt_frequency |
126 | (only needed if you intended to use fixed_rate_gettimeoffset | 126 | (only needed if you intended to use fixed_rate_gettimeoffset |
127 | or use cpu counter as timer interrupt source) | 127 | or use cpu counter as timer interrupt source) |
128 | 128 | ||
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 6f8a9fe7c1e3..c079e2ae02a1 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -187,7 +187,7 @@ out: | |||
187 | } | 187 | } |
188 | 188 | ||
189 | /* | 189 | /* |
190 | * Estimate CPU frequency. Sets mips_counter_frequency as a side-effect | 190 | * Estimate CPU frequency. Sets mips_hpt_frequency as a side-effect |
191 | */ | 191 | */ |
192 | static unsigned int __init estimate_cpu_frequency(void) | 192 | static unsigned int __init estimate_cpu_frequency(void) |
193 | { | 193 | { |
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c index c566b9bd0427..24a4ed00cc0a 100644 --- a/arch/mips/mips-boards/sim/sim_time.c +++ b/arch/mips/mips-boards/sim/sim_time.c | |||
@@ -102,7 +102,7 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id) | |||
102 | 102 | ||
103 | 103 | ||
104 | /* | 104 | /* |
105 | * Estimate CPU frequency. Sets mips_counter_frequency as a side-effect | 105 | * Estimate CPU frequency. Sets mips_hpt_frequency as a side-effect |
106 | */ | 106 | */ |
107 | static unsigned int __init estimate_cpu_frequency(void) | 107 | static unsigned int __init estimate_cpu_frequency(void) |
108 | { | 108 | { |