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

Commit 7ff550de authored by Russell King's avatar Russell King
Browse files

clocksource: ARM sp804: obtain sp804 timer rate via clks 



This allows platforms to specify the rate of the SP804 clocksource via
the clk subsystem.  While ARM boards clock these at 1MHz, BCMRing also
has SP804 timers but are clocked at different rates.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fb593cf3

arch/arm/common/timer-sp.c

+38 −1
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#include <linux/clk.h>

#include <linux/clocksource.h>

#include <linux/clockchips.h>

#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/io.h>
@@ -32,8 +34,43 @@ 
#define TIMER_FREQ_KHZ	(1000)

#define TIMER_RELOAD	(TIMER_FREQ_KHZ * 1000 / HZ)



static long __init sp804_get_clock_rate(const char *name)

{

	struct clk *clk;

	long rate;

	int err;



	clk = clk_get_sys("sp804", name);

	if (IS_ERR(clk)) {

		pr_err("sp804: %s clock not found: %d\n", name,

			(int)PTR_ERR(clk));

		return PTR_ERR(clk);

	}



	err = clk_enable(clk);

	if (err) {

		pr_err("sp804: %s clock failed to enable: %d\n", name, err);

		clk_put(clk);

		return err;

	}



	rate = clk_get_rate(clk);

	if (rate < 0) {

		pr_err("sp804: %s clock failed to get rate: %ld\n", name, rate);

		clk_disable(clk);

		clk_put(clk);

	}



	return rate;

}



void __init sp804_clocksource_init(void __iomem *base, const char *name)

{

	long rate = sp804_get_clock_rate(name);



	if (rate < 0)

		return;



	/* setup timer 0 as free-running clocksource */

	writel(0, base + TIMER_CTRL);

	writel(0xffffffff, base + TIMER_LOAD);
@@ -42,7 +79,7 @@ void __init sp804_clocksource_init(void __iomem *base, const char *name) 
		base + TIMER_CTRL);



	clocksource_mmio_init(base + TIMER_VALUE, name,

		TIMER_FREQ_KHZ * 1000, 200, 32, clocksource_mmio_readl_down);

		rate, 200, 32, clocksource_mmio_readl_down);

}

arch/arm/mach-integrator/integrator_cp.c

+7 −0
Original line number Diff line number Diff line
@@ -229,10 +229,17 @@ static struct clk cp_auxclk = { 
	.vcoreg	= CM_AUXOSC,

};



static struct clk sp804_clk = {

	.rate	= 1000000,

};



static struct clk_lookup cp_lookups[] = {

	{	/* CLCD */

		.dev_id		= "mb:c0",

		.clk		= &cp_auxclk,

	}, {	/* SP804 timers */

		.dev_id		= "sp804",

		.clk		= &sp804_clk,

	},

};

arch/arm/mach-realview/core.c

+8 −1
Original line number Diff line number Diff line
@@ -315,6 +315,10 @@ static struct clk ref24_clk = { 
	.rate	= 24000000,

};



static struct clk sp804_clk = {

	.rate	= 1000000,

};



static struct clk dummy_apb_pclk;



static struct clk_lookup lookups[] = {
@@ -357,7 +361,10 @@ static struct clk_lookup lookups[] = { 
	}, {	/* SSP */

		.dev_id		= "dev:ssp0",

		.clk		= &ref24_clk,

	}

	}, {	/* SP804 timers */

		.dev_id		= "sp804",

		.clk		= &sp804_clk,

	},

};



void __init realview_init_early(void)

arch/arm/mach-versatile/core.c

+8 −1
Original line number Diff line number Diff line
@@ -375,6 +375,10 @@ static struct clk ref24_clk = { 
	.rate	= 24000000,

};



static struct clk sp804_clk = {

	.rate	= 1000000,

};



static struct clk dummy_apb_pclk;



static struct clk_lookup lookups[] = {
@@ -411,7 +415,10 @@ static struct clk_lookup lookups[] = { 
	}, {	/* CLCD */

		.dev_id		= "dev:20",

		.clk		= &osc4_clk,

	}

	}, {	/* SP804 timers */

		.dev_id		= "sp804",

		.clk		= &sp804_clk,

	},

};



/*

arch/arm/mach-vexpress/ct-ca9x4.c

+8 −0
Original line number Diff line number Diff line
@@ -141,10 +141,18 @@ static struct clk osc1_clk = { 
	.rate	= 24000000,

};



static struct clk ct_sp804_clk = {

	.rate	= 1000000,

};



static struct clk_lookup lookups[] = {

	{	/* CLCD */

		.dev_id		= "ct:clcd",

		.clk		= &osc1_clk,

	}, {	/* SP804 timers */

		.dev_id		= "sp804",

		.con_id		= "ct-timer1",

		.clk		= &ct_sp804_clk,

	},

};