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

Commit e504c4b6 authored by Baruch Siach's avatar Baruch Siach Committed by Chris Zankel
Browse files

xtensa: cleanup ccount frequency tracking 



Remove unused nsec_per_ccount, and rename ccount_per_jiffy to ccount_preq.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent ed9dfed6

arch/xtensa/include/asm/timex.h

+2 −3
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ 
#endif



#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

extern unsigned long ccount_per_jiffy;

extern unsigned long nsec_per_ccount;

#define CCOUNT_PER_JIFFY ccount_per_jiffy

extern unsigned long ccount_freq;

#define CCOUNT_PER_JIFFY (ccount_freq / HZ)

#else

#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))

#endif

arch/xtensa/kernel/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ _F(void, pcibios_init, (void), { }); 
_F(void, calibrate_ccount, (void),

{

	pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10MHz.\n");

	ccount_per_jiffy = 10 * (1000000UL/HZ);

	ccount_freq = 10 * 1000000UL;

});

#endif

arch/xtensa/kernel/time.c

+3 −4
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
#include <asm/platform.h>



#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

unsigned long ccount_per_jiffy;		/* per 1/HZ */

unsigned long nsec_per_ccount;		/* nsec per ccount increment */

unsigned long ccount_freq;		/* ccount Hz */

#endif



static cycle_t ccount_read(struct clocksource *cs)
@@ -57,8 +56,8 @@ void __init time_init(void) 
#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

	printk("Calibrating CPU frequency ");

	platform_calibrate_ccount();

	printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ),

			(int)(ccount_per_jiffy/(10000/HZ))%100);

	printk("%d.%02d MHz\n", (int)ccount_freq/1000000,

			(int)(ccount_freq/10000)%100);

#endif

	clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ);

arch/xtensa/platforms/xtfpga/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -179,8 +179,7 @@ void __init platform_calibrate_ccount(void) 
	if (!clk_freq)

		clk_freq = *(long *)XTFPGA_CLKFRQ_VADDR;



	ccount_per_jiffy = clk_freq / HZ;

	nsec_per_ccount = 1000000000UL / clk_freq;

	ccount_freq = clk_freq;

}



#endif

arch/xtensa/variants/s6000/delay.c

+1 −2
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ void platform_calibrate_ccount(void) 
			a = b;

	} while (--i >= 0);

	b -= a;

	nsec_per_ccount = (LOOPS * 10000) / b;

	ccount_per_jiffy = b * (100000UL / (LOOPS * HZ));

	ccount_freq = b * (100000UL / LOOPS);

}