diff options
author | Donald Johnson <donald.k.johnson@intel.com> | 2011-02-02 11:20:16 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2011-03-15 12:02:06 -0400 |
commit | 57539c1cf9f146ab9988a350dbc2d7e69a8a5c30 (patch) | |
tree | 5a9201718926afdac1bce6a179ec7f1c8a9428ff /drivers/watchdog/Kconfig | |
parent | 742e4b630895d751812b0682750db76c8072bf37 (diff) |
watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
This submission includes:
- Fix to intel_scu_write() to start watchdog timer the on the
first write, and refresh on subsequent writes.
This enables Open, write, write, ... usage model.
- Moves boot parameter checks from intel_scu_open() to
intel_scu_watchdog_init(), so driver init will fail if these
parameters are out of bounds.
- Adds check for whether process waiting in wait_event_interruptible()
received a signal while it was waiting.
- Other small error handling changes.
Removed the read() method for now as that wass a non-standard behaviour.
Signed-off-by: Donald Johnson <donald.k.johnson@intel.com>
Signed-off-by: Shuduo Sang <shuduo.sang@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r-- | drivers/watchdog/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 6041692e2107..28a9835f8256 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -533,6 +533,16 @@ config I6300ESB_WDT | |||
533 | To compile this driver as a module, choose M here: the | 533 | To compile this driver as a module, choose M here: the |
534 | module will be called i6300esb. | 534 | module will be called i6300esb. |
535 | 535 | ||
536 | config INTEL_SCU_WATCHDOG | ||
537 | bool "Intel SCU Watchdog for Mobile Platforms" | ||
538 | depends on WATCHDOG | ||
539 | depends on INTEL_SCU_IPC | ||
540 | ---help--- | ||
541 | Hardware driver for the watchdog time built into the Intel SCU | ||
542 | for Intel Mobile Platforms. | ||
543 | |||
544 | To compile this driver as a module, choose M here. | ||
545 | |||
536 | config ITCO_WDT | 546 | config ITCO_WDT |
537 | tristate "Intel TCO Timer/Watchdog" | 547 | tristate "Intel TCO Timer/Watchdog" |
538 | depends on (X86 || IA64) && PCI | 548 | depends on (X86 || IA64) && PCI |