Skip to content

Commit

Permalink
watchdog: sirf: don't depend on dummy value of CLOCK_TICK_RATE
Browse files Browse the repository at this point in the history
As CSR SiRF is converted to multi platform CLOCK_TICK_RATE is a dummy
value that seems to match the right value is used.
(arch/arm/mach-prima2/include/mach/timex.h which defined CLOCK_TICK_RATE
to 1000000 was removed in commit cf82e0e (ARM: sirf: enable
multiplatform support); marco used the same file.)

To not depend on that dummy value use a local #define instead.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Uwe Kleine-König authored and Wim Van Sebroeck committed Nov 17, 2013
1 parent ab5bbdc commit b0df38d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/watchdog/sirfsoc_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <linux/io.h>
#include <linux/uaccess.h>

#define CLOCK_FREQ 1000000

#define SIRFSOC_TIMER_COUNTER_LO 0x0000
#define SIRFSOC_TIMER_MATCH_0 0x0008
#define SIRFSOC_TIMER_INT_EN 0x0024
Expand Down Expand Up @@ -50,15 +52,15 @@ static unsigned int sirfsoc_wdt_gettimeleft(struct watchdog_device *wdd)

time_left = match - counter;

return time_left / CLOCK_TICK_RATE;
return time_left / CLOCK_FREQ;
}

static int sirfsoc_wdt_updatetimeout(struct watchdog_device *wdd)
{
u32 counter, timeout_ticks;
void __iomem *wdt_base;

timeout_ticks = wdd->timeout * CLOCK_TICK_RATE;
timeout_ticks = wdd->timeout * CLOCK_FREQ;
wdt_base = watchdog_get_drvdata(wdd);

/* Enable the latch before reading the LATCH_LO register */
Expand Down

0 comments on commit b0df38d

Please sign in to comment.