lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] S3C: Add TICK_MAX for timer code

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

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Ben Dooks
2008-10-21 14:07:01 +01:00
parent 4b31d8b225
commit c652d2ddb9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c6400/include/mach/tick.h
View File

@@ -24,4 +24,6 @@ static inline u32 s3c24xx_ostimer_pending(void)
return pend & 1 << (IRQ_TIMER4_VIC - S3C64XX_IRQ_VIC0(0)); return pend & 1 << (IRQ_TIMER4_VIC - S3C64XX_IRQ_VIC0(0));
} }
#define TICK_MAX (0xffffffff)
#endif /* __ASM_ARCH_6400_TICK_H */ #endif /* __ASM_ARCH_6400_TICK_H */

8
arch/arm/plat-s3c/time.c
View File

@@ -44,6 +44,10 @@
static unsigned long timer_startval; static unsigned long timer_startval;
static unsigned long timer_usec_ticks; static unsigned long timer_usec_ticks;
#ifndef TICK_MAX
#define TICK_MAX (0xffff)
#endif
#define TIMER_USEC_SHIFT 16 #define TIMER_USEC_SHIFT 16
/* we use the shifted arithmetic to work out the ratio of timer ticks /* 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 tcfg1;
unsigned long tcfg0; unsigned long tcfg0;
tcnt = 0xffff; /* default value for tcnt */ tcnt = TICK_MAX; /* default value for tcnt */
/* read the current timer configuration bits */ /* read the current timer configuration bits */
@@ -217,7 +221,7 @@ static void s3c2410_timer_setup (void)
tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks); tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks);
/* check to see if timer is within 16bit range... */ /* 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!"); panic("setup_timer: HZ is too small, cannot configure timer!");
return; return;
} }