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

Commit 1368c51c authored by Li Jie's avatar Li Jie Committed by Russell King
Browse files

ARM: 5863/1: fix bugs of clock source of NUC900 



This patch fix following bugs:

1. typo error, CLOCK_EVT_MODE_PERIODIC -> CLOCK_EVT_FEAT_PERIODIC
2. TCSR register of timer1 missed PRESCALE
3. timer1 should be enabled before register it to clock source.

Signed-off-by: default avatarlijie <eltshanli@gmail.com>
Acked-by: default avatarWan ZongShun <mcuos.com@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 070f1f17

arch/arm/mach-w90x900/time.c

+37 −27
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ 
#define TICKS_PER_SEC	100

#define PRESCALE	0x63 /* Divider = prescale + 1 */



unsigned int timer0_load;

#define	TDR_SHIFT	24

#define	TDR_MASK	((1 << TDR_SHIFT) - 1)



static unsigned int timer0_load;



static void nuc900_clockevent_setmode(enum clock_event_mode mode,

		struct clock_event_device *clk)
@@ -88,7 +91,7 @@ static int nuc900_clockevent_setnextevent(unsigned long evt, 
static struct clock_event_device nuc900_clockevent_device = {

	.name		= "nuc900-timer0",

	.shift		= 32,

	.features	= CLOCK_EVT_MODE_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.set_mode	= nuc900_clockevent_setmode,

	.set_next_event	= nuc900_clockevent_setnextevent,

	.rating		= 300,
@@ -112,8 +115,23 @@ static struct irqaction nuc900_timer0_irq = { 
	.handler	= nuc900_timer0_interrupt,

};



static void __init nuc900_clockevents_init(unsigned int rate)

static void __init nuc900_clockevents_init(void)

{

	unsigned int rate;

	struct clk *clk = clk_get(NULL, "timer0");



	BUG_ON(IS_ERR(clk));



	__raw_writel(0x00, REG_TCSR0);



	clk_enable(clk);

	rate = clk_get_rate(clk) / (PRESCALE + 1);



	timer0_load = (rate / TICKS_PER_SEC);



	__raw_writel(RESETINT, REG_TISR);

	setup_irq(IRQ_TIMER0, &nuc900_timer0_irq);



	nuc900_clockevent_device.mult = div_sc(rate, NSEC_PER_SEC,

					nuc900_clockevent_device.shift);

	nuc900_clockevent_device.max_delta_ns = clockevent_delta2ns(0xffffffff,
@@ -127,26 +145,35 @@ static void __init nuc900_clockevents_init(unsigned int rate) 


static cycle_t nuc900_get_cycles(struct clocksource *cs)

{

	return ~__raw_readl(REG_TDR1);

	return (~__raw_readl(REG_TDR1)) & TDR_MASK;

}



static struct clocksource clocksource_nuc900 = {

	.name	= "nuc900-timer1",

	.rating	= 200,

	.read	= nuc900_get_cycles,

	.mask	= CLOCKSOURCE_MASK(32),

	.shift	= 20,

	.mask	= CLOCKSOURCE_MASK(TDR_SHIFT),

	.shift	= 10,

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,

};



static void __init nuc900_clocksource_init(unsigned int rate)

static void __init nuc900_clocksource_init(void)

{

	unsigned int val;

	unsigned int rate;

	struct clk *clk = clk_get(NULL, "timer1");



	BUG_ON(IS_ERR(clk));



	__raw_writel(0x00, REG_TCSR1);



	clk_enable(clk);

	rate = clk_get_rate(clk) / (PRESCALE + 1);



	__raw_writel(0xffffffff, REG_TICR1);



	val = __raw_readl(REG_TCSR1);

	val |= (COUNTEN | PERIOD);

	val |= (COUNTEN | PERIOD | PRESCALE);

	__raw_writel(val, REG_TCSR1);



	clocksource_nuc900.mult =
@@ -156,25 +183,8 @@ static void __init nuc900_clocksource_init(unsigned int rate) 


static void __init nuc900_timer_init(void)

{

	struct clk *ck_ext = clk_get(NULL, "ext");

	unsigned int	rate;



	BUG_ON(IS_ERR(ck_ext));



	rate = clk_get_rate(ck_ext);

	clk_put(ck_ext);

	rate = rate / (PRESCALE + 0x01);



	 /* set a known state */

	__raw_writel(0x00, REG_TCSR0);

	__raw_writel(0x00, REG_TCSR1);

	__raw_writel(RESETINT, REG_TISR);

	timer0_load = (rate / TICKS_PER_SEC);



	setup_irq(IRQ_TIMER0, &nuc900_timer0_irq);



	nuc900_clocksource_init(rate);

	nuc900_clockevents_init(rate);

	nuc900_clocksource_init();

	nuc900_clockevents_init();

}



struct sys_timer nuc900_timer = {