[PATCH] powerpc: restore clock speed in /proc/cpuinfo
Use generic_calibrate_decr to restore missing clock: speed in /proc/cpuinfo Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
d8a8188ded
commit
0347880492
3 changed files with 1 additions and 23 deletions
|
@ -5,7 +5,6 @@
|
|||
extern void chrp_nvram_init(void);
|
||||
extern void chrp_get_rtc_time(struct rtc_time *);
|
||||
extern int chrp_set_rtc_time(struct rtc_time *);
|
||||
extern void chrp_calibrate_decr(void);
|
||||
extern long chrp_time_init(void);
|
||||
|
||||
extern void chrp_find_bridges(void);
|
||||
|
|
|
@ -506,7 +506,7 @@ void __init chrp_init(void)
|
|||
ppc_md.halt = rtas_halt;
|
||||
|
||||
ppc_md.time_init = chrp_time_init;
|
||||
ppc_md.calibrate_decr = chrp_calibrate_decr;
|
||||
ppc_md.calibrate_decr = generic_calibrate_decr;
|
||||
|
||||
/* this may get overridden with rtas routines later... */
|
||||
ppc_md.set_rtc_time = chrp_set_rtc_time;
|
||||
|
|
|
@ -167,24 +167,3 @@ void chrp_get_rtc_time(struct rtc_time *tm)
|
|||
tm->tm_mon = mon;
|
||||
tm->tm_year = year;
|
||||
}
|
||||
|
||||
|
||||
void __init chrp_calibrate_decr(void)
|
||||
{
|
||||
struct device_node *cpu;
|
||||
unsigned int freq, *fp;
|
||||
|
||||
/*
|
||||
* The cpu node should have a timebase-frequency property
|
||||
* to tell us the rate at which the decrementer counts.
|
||||
*/
|
||||
freq = 16666000; /* hardcoded default */
|
||||
cpu = find_type_devices("cpu");
|
||||
if (cpu != 0) {
|
||||
fp = (unsigned int *)
|
||||
get_property(cpu, "timebase-frequency", NULL);
|
||||
if (fp != 0)
|
||||
freq = *fp;
|
||||
}
|
||||
ppc_tb_freq = freq;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue