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

Commit cab463a2 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

watchdog: ks8695: sink registers into driver 



Commit 70adc3f3
"ARM: ks8695: merge the timer header into the timer driver"
accidentally broke the ks8695 watchdog since it was using
the timer registers in watchdog mode.

Perform the same operation here: push the registers down
into the driver, so it is self-contained, and we can keep
depopulating the <mach/*> namespace.

Reported-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent c7e783d6

drivers/watchdog/ks8695_wdt.c

+13 −1
Original line number Diff line number Diff line
@@ -24,7 +24,19 @@ 
#include <linux/io.h>

#include <linux/uaccess.h>

#include <mach/hardware.h>

#include <mach/regs-timer.h>



#define KS8695_TMR_OFFSET	(0xF0000 + 0xE400)

#define KS8695_TMR_VA		(KS8695_IO_VA + KS8695_TMR_OFFSET)



/*

 * Timer registers

 */

#define KS8695_TMCON		(0x00)		/* Timer Control Register */

#define KS8695_T0TC		(0x08)		/* Timer 0 Timeout Count Register */

#define TMCON_T0EN		(1 << 0)	/* Timer 0 Enable */



/* Timer0 Timeout Counter Register */

#define T0TC_WATCHDOG		(0xff)		/* Enable watchdog mode */



#define WDT_DEFAULT_TIME	5	/* seconds */

#define WDT_MAX_TIME		171	/* seconds */