Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03478804 authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[PATCH] powerpc: restore clock speed in /proc/cpuinfo 



Use generic_calibrate_decr to restore missing clock: speed in /proc/cpuinfo

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d8a8188d

arch/powerpc/platforms/chrp/chrp.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/chrp/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/platforms/chrp/time.c

+0 −21
Original line number Diff line number Diff line
@@ -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;

}