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

Commit 28a62385 authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant 



See description of commit:

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

for additional information.

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 6769717d

drivers/watchdog/sa1100_wdt.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -35,8 +35,7 @@ 
#include <mach/reset.h>

#include <mach/reset.h>

#include <mach/hardware.h>

#include <mach/hardware.h>





#define OSCR_FREQ		CLOCK_TICK_RATE

static unsigned long oscr_freq;



static unsigned long sa1100wdt_users;

static unsigned long sa1100wdt_users;

static int pre_margin;

static int pre_margin;

static int boot_status;

static int boot_status;
@@ -123,12 +122,12 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd, 
			break;

			break;

		}

		}





		pre_margin = OSCR_FREQ * time;

		pre_margin = oscr_freq * time;

		OSMR3 = OSCR + pre_margin;

		OSMR3 = OSCR + pre_margin;

		/*fall through*/

		/*fall through*/





	case WDIOC_GETTIMEOUT:

	case WDIOC_GETTIMEOUT:

		ret = put_user(pre_margin / OSCR_FREQ, p);

		ret = put_user(pre_margin / oscr_freq, p);

		break;

		break;

	}

	}

	return ret;

	return ret;
@@ -155,6 +154,8 @@ static int __init sa1100dog_init(void) 
{

{

	int ret;

	int ret;





	oscr_freq = get_clock_tick_rate();



	/*

	/*

	 * Read the reset status, and save it for later.  If

	 * Read the reset status, and save it for later.  If

	 * we suspend, RCSR will be cleared, and the watchdog

	 * we suspend, RCSR will be cleared, and the watchdog
@@ -162,7 +163,7 @@ static int __init sa1100dog_init(void) 
	 */

	 */

	boot_status = (reset_status & RESET_STATUS_WATCHDOG) ?

	boot_status = (reset_status & RESET_STATUS_WATCHDOG) ?

				WDIOF_CARDRESET : 0;

				WDIOF_CARDRESET : 0;

	pre_margin = OSCR_FREQ * margin;

	pre_margin = oscr_freq * margin;





	ret = misc_register(&sa1100dog_miscdev);

	ret = misc_register(&sa1100dog_miscdev);

	if (ret == 0)

	if (ret == 0)