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

Commit deb77c85 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

[PATCH] m68knommu: fix timer register access on 523x ColdFire platforms 



The 523x timer TRR register is a full 32bits, the older register (on
other ColdFire parts) was only 16 bits.  Use the right type of
__raw_read when accessing it.

Problem found by Yaroslav Vinogradov <yaroslav.vinogradov@freescale.com>

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dd93e857

arch/m68knommu/platform/5307/timers.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
/*

/*

 *	timers.c -- generic ColdFire hardware timer support.

 *	timers.c -- generic ColdFire hardware timer support.

 *

 *

 *	Copyright (C) 1999-2003, Greg Ungerer (gerg@snapgear.com)

 *	Copyright (C) 1999-2006, Greg Ungerer (gerg@snapgear.com)

 */

 */





/***************************************************************************/

/***************************************************************************/
@@ -44,6 +44,14 @@ unsigned int mcf_timerlevel = 5; 
extern void mcf_settimericr(int timer, int level);

extern void mcf_settimericr(int timer, int level);

extern int mcf_timerirqpending(int timer);

extern int mcf_timerirqpending(int timer);





#if defined(CONFIG_M532x)

#define	__raw_readtrr	__raw_readl

#define	__raw_writetrr	__raw_writel

#else

#define	__raw_readtrr	__raw_readw

#define	__raw_writetrr	__raw_writew

#endif



/***************************************************************************/

/***************************************************************************/





void coldfire_tick(void)

void coldfire_tick(void)
@@ -57,7 +65,7 @@ void coldfire_tick(void) 
void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))

void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))

{

{

	__raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));

	__raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));

	__raw_writew(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));

	__raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));

	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |

	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |

		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));

		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));
@@ -76,7 +84,7 @@ unsigned long coldfire_timer_offset(void) 
	unsigned long trr, tcn, offset;

	unsigned long trr, tcn, offset;





	tcn = __raw_readw(TA(MCFTIMER_TCN));

	tcn = __raw_readw(TA(MCFTIMER_TCN));

	trr = __raw_readw(TA(MCFTIMER_TRR));

	trr = __raw_readtrr(TA(MCFTIMER_TRR));

	offset = (tcn * (1000000 / HZ)) / trr;

	offset = (tcn * (1000000 / HZ)) / trr;





	/* Check if we just wrapped the counters and maybe missed a tick */

	/* Check if we just wrapped the counters and maybe missed a tick */
@@ -120,7 +128,7 @@ void coldfire_profile_init(void) 
	/* Set up TIMER 2 as high speed profile clock */

	/* Set up TIMER 2 as high speed profile clock */

	__raw_writew(MCFTIMER_TMR_DISABLE, PA(MCFTIMER_TMR));

	__raw_writew(MCFTIMER_TMR_DISABLE, PA(MCFTIMER_TMR));





	__raw_writew(((MCF_CLK / 16) / PROFILEHZ), PA(MCFTIMER_TRR));

	__raw_writetrr(((MCF_CLK / 16) / PROFILEHZ), PA(MCFTIMER_TRR));

	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |

	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |

		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));

		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));