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

Commit c652d2dd authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C: Add TICK_MAX for timer code 



Add TICK_MAX definition for the timer code
as the S3C64XX series have 32bit capable
PWM timers.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 4b31d8b2

arch/arm/mach-s3c6400/include/mach/tick.h

+2 −0
Original line number Diff line number Diff line
@@ -24,4 +24,6 @@ static inline u32 s3c24xx_ostimer_pending(void) 
	return pend & 1 << (IRQ_TIMER4_VIC - S3C64XX_IRQ_VIC0(0));

}



#define TICK_MAX	(0xffffffff)



#endif /* __ASM_ARCH_6400_TICK_H */

arch/arm/plat-s3c/time.c

+6 −2
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ 
static unsigned long timer_startval;

static unsigned long timer_usec_ticks;



#ifndef TICK_MAX

#define TICK_MAX (0xffff)

#endif



#define TIMER_USEC_SHIFT 16



/* we use the shifted arithmetic to work out the ratio of timer ticks
@@ -156,7 +160,7 @@ static void s3c2410_timer_setup (void) 
	unsigned long tcfg1;

	unsigned long tcfg0;



	tcnt = 0xffff;  /* default value for tcnt */

	tcnt = TICK_MAX;  /* default value for tcnt */



	/* read the current timer configuration bits */
@@ -217,7 +221,7 @@ static void s3c2410_timer_setup (void) 
	       tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks);



	/* check to see if timer is within 16bit range... */

	if (tcnt > 0xffff) {

	if (tcnt > TICK_MAX) {

		panic("setup_timer: HZ is too small, cannot configure timer!");

		return;

	}