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

Commit b0df38dd authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wim Van Sebroeck
Browse files

watchdog: sirf: don't depend on dummy value of CLOCK_TICK_RATE 



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 cf82e0e4 (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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent ab5bbdc7

drivers/watchdog/sirfsoc_wdt.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/uaccess.h>

#include <linux/uaccess.h>





#define CLOCK_FREQ	1000000



#define SIRFSOC_TIMER_COUNTER_LO	0x0000

#define SIRFSOC_TIMER_COUNTER_LO	0x0000

#define SIRFSOC_TIMER_MATCH_0		0x0008

#define SIRFSOC_TIMER_MATCH_0		0x0008

#define SIRFSOC_TIMER_INT_EN		0x0024

#define SIRFSOC_TIMER_INT_EN		0x0024
@@ -50,7 +52,7 @@ static unsigned int sirfsoc_wdt_gettimeleft(struct watchdog_device *wdd) 




	time_left = match - counter;

	time_left = match - counter;





	return time_left / CLOCK_TICK_RATE;

	return time_left / CLOCK_FREQ;

}

}





static int sirfsoc_wdt_updatetimeout(struct watchdog_device *wdd)

static int sirfsoc_wdt_updatetimeout(struct watchdog_device *wdd)
@@ -58,7 +60,7 @@ static int sirfsoc_wdt_updatetimeout(struct watchdog_device *wdd) 
	u32 counter, timeout_ticks;

	u32 counter, timeout_ticks;

	void __iomem *wdt_base;

	void __iomem *wdt_base;





	timeout_ticks = wdd->timeout * CLOCK_TICK_RATE;

	timeout_ticks = wdd->timeout * CLOCK_FREQ;

	wdt_base = watchdog_get_drvdata(wdd);

	wdt_base = watchdog_get_drvdata(wdd);





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

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