Skip to content

Commit

Permalink
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
Browse files Browse the repository at this point in the history
See description of commit:

   [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant

for additional information.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
  • Loading branch information
Eric Miao committed Dec 29, 2008
1 parent 6769717 commit 28a6238
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/watchdog/sa1100_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
#include <mach/reset.h>
#include <mach/hardware.h>

#define OSCR_FREQ CLOCK_TICK_RATE

static unsigned long oscr_freq;
static unsigned long sa1100wdt_users;
static int pre_margin;
static int boot_status;
Expand Down Expand Up @@ -123,12 +122,12 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd,
break;
}

pre_margin = OSCR_FREQ * time;
pre_margin = oscr_freq * time;
OSMR3 = OSCR + pre_margin;
/*fall through*/

case WDIOC_GETTIMEOUT:
ret = put_user(pre_margin / OSCR_FREQ, p);
ret = put_user(pre_margin / oscr_freq, p);
break;
}
return ret;
Expand All @@ -155,14 +154,16 @@ static int __init sa1100dog_init(void)
{
int ret;

oscr_freq = get_clock_tick_rate();

/*
* Read the reset status, and save it for later. If
* we suspend, RCSR will be cleared, and the watchdog
* reset reason will be lost.
*/
boot_status = (reset_status & RESET_STATUS_WATCHDOG) ?
WDIOF_CARDRESET : 0;
pre_margin = OSCR_FREQ * margin;
pre_margin = oscr_freq * margin;

ret = misc_register(&sa1100dog_miscdev);
if (ret == 0)
Expand Down

0 comments on commit 28a6238

Please sign in to comment.