linux-toradex.git/drivers/watchdog, branch v3.0.2

watchdog: shwdt: fix usage of mod_timer

2011-08-05T04:58:42+00:00

commit bea1906620ce72b63f83735c4cc2642b25ec54ae upstream.

Fix the usage of mod_timer() and make the driver usable. mod_timer() must
be called with an absolute timeout in jiffies. The old implementation
used a relative timeout thus the hardware watchdog was never triggered.

Signed-off-by: David Engraf 
Signed-off-by: Paul Mundt 
Signed-off-by: Wim Van sebroeck 
Signed-off-by: Andrew Morton 
Signed-off-by: Greg Kroah-Hartman

watchdog: hpwdt depends on PCI

2011-07-17T12:40:08+00:00

hpwdt is a PCI driver so it should depend on PCI.
Fixes these build errors:

drivers/watchdog/hpwdt.c:762: error: implicit declaration of function 'pci_iomap'
drivers/watchdog/hpwdt.c:762: warning: assignment makes pointer from integer without a cast
drivers/watchdog/hpwdt.c:797: error: implicit declaration of function 'pci_iounmap'

Signed-off-by: Randy Dunlap 
Signed-off-by: Wim Van Sebroeck 
Cc: Thomas Mingarelli

watchdog: fix hpwdt Kconfig regression in 3.0-rc

2011-07-16T06:06:12+00:00

Remove Kconfig regression caused by commit
a4616153deae053b29a2b7dd9ec4b2a225accfc5 "watchdog: hpwdt: build hpwdt as
module by default with NMI_DECODING enabled"

With the above change applied, hpwdt will be enabled unconditionally by just
entering the Watchdog subscreen in menuconfig. Since this driver is not
essential to boot any box it should remain disabled until it gets manually
enabled, just like all other drivers.

Signed-off-by: Olaf Hering 
Cc: Tony Camuso 
Signed-off-by: Wim Van Sebroeck 
Signed-off-by: Andrew Morton

watchdog: update author email for at32ap700x_wdt

2011-06-28T20:01:25+00:00

This patch updates the email address of the at32ap700x_wdt driver supported by
me to an email account I will use on a more regular basis in the future.

Signed-off-by: Hans-Christian Egtvedt 
Signed-off-by: Wim Van Sebroeck

watchdog: gef_wdt: fix MODULE_ALIAS

2011-06-28T07:43:00+00:00

Remove the space between "platform:" prefix and the driver name.

Signed-off-by: Axel Lin 
Acked-by: Martyn Welch 
Signed-off-by: Wim Van Sebroeck

watchdog: Intel SCU Watchdog: Fix build and remove duplicate code

2011-06-28T07:42:50+00:00

Trying to build the Intel SCU Watchdog fails for me with gcc 4.6.0 -
$ gcc --version | head -n 1
gcc (GCC) 4.6.0 20110513 (prerelease)

like this :
  CC      drivers/watchdog/intel_scu_watchdog.o
In file included from drivers/watchdog/intel_scu_watchdog.c:49:0:
/home/jj/src/linux-2.6/arch/x86/include/asm/apb_timer.h: In function ‘apbt_time_init’:
/home/jj/src/linux-2.6/arch/x86/include/asm/apb_timer.h:65:42: warning: ‘return’ with a value, in function returning void [enabled by default]
drivers/watchdog/intel_scu_watchdog.c: In function ‘intel_scu_watchdog_init’:
drivers/watchdog/intel_scu_watchdog.c:468:2: error: implicit declaration of function ‘sfi_get_mtmr’ [-Werror=implicit-function-declaration]
drivers/watchdog/intel_scu_watchdog.c:468:32: warning: assignment makes pointer from integer without a cast [enabled by default]
cc1: some warnings being treated as errors

make[1]: *** [drivers/watchdog/intel_scu_watchdog.o] Error 1
make: *** [drivers/watchdog/intel_scu_watchdog.o] Error 2

Additionally, linux/types.h is needlessly being included twice in 
drivers/watchdog/intel_scu_watchdog.c

Signed-off-by: Jesper Juhl 
Signed-off-by: Wim Van Sebroeck

watchdog: mtx1-wdt: fix section mismatch

2011-06-28T07:42:40+00:00

Fix section mismatch and remove unused variable 'tmp'.

Signed-off-by: Florian Fainelli 
Signed-off-by: Wim Van Sebroeck

watchdog: mtx1-wdt: fix GPIO toggling

2011-06-28T07:42:30+00:00

Commit e391be76 (MIPS: Alchemy: Clean up GPIO registers and accessors)
changed the way the GPIO was toggled. Prior to this patch, we would
always actively drive the GPIO output to either 0 or 1, this patch
drove the GPIO active to 0, and put the GPIO in tristate to drive it
to 1, unfortunately this does not work, revert back to active driving.

Using a signed variable (gstate) to hold the gpio state and using a bit-
wise operation on it also resulted in toggling value from 1 to -2 since
the variable is signed. This value was then passed on to gpio_direction_
output, which always perform a if (value) ... to set the value to the
gpio, so we were always writing a 1 to this GPIO instead of 1 -> 0 -> 1 ...

Signed-off-by: Florian Fainelli 
Signed-off-by: Wim Van Sebroeck 
Cc: stable

watchdog: mtx1-wdt: request gpio before using it

2011-06-28T07:42:23+00:00

Otherwise, the gpiolib autorequest feature will produce a WARN_ON():

WARNING: at drivers/gpio/gpiolib.c:101 0x8020ec6c()
autorequest GPIO-215
[...]

Signed-off-by: Florian Fainelli 
Signed-off-by: Wim Van Sebroeck 
Cc: stable

watchdog: Handle multiple wm831x watchdogs being registered

2011-06-28T07:42:16+00:00

Due to the whole single instance based watchdog API we use static data
for the wm831x watchdog which means that if the system tries to register
a second one we end up trying to register the same miscdevice again,
corrupting the miscdevice list. Work around this by checking for duplicate
registrations until we get a watchdog core.

Signed-off-by: Mark Brown 
Signed-off-by: Wim Van Sebroeck