diff options
| author | Aaron Sierra <asierra@xes-inc.com> | 2012-04-20 14:14:11 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-09 17:20:09 +0200 |
| commit | 887c8ec7219fc8eba78bb8f44a74c660934e9b98 (patch) | |
| tree | c7f5b2d24c984a7ca57120dd057cd3cd2f6efee2 /include/linux | |
| parent | 16c5c023aac86228e3e94c4bf6d19708ea861a05 (diff) | |
| download | linux-stable-887c8ec7219fc8eba78bb8f44a74c660934e9b98.tar.gz linux-stable-887c8ec7219fc8eba78bb8f44a74c660934e9b98.tar.bz2 linux-stable-887c8ec7219fc8eba78bb8f44a74c660934e9b98.zip | |
watchdog: Convert iTCO_wdt driver to mfd model
This patch converts the iTCO_wdt driver to use the multi-function device
driver model. It uses resources discovered by the lpc_ich driver, so that
it no longer does its own PCI scanning.
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/lpc_ich.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mfd/lpc_ich.h b/include/linux/mfd/lpc_ich.h index 91300b18219b..fec5256c3f5d 100644 --- a/include/linux/mfd/lpc_ich.h +++ b/include/linux/mfd/lpc_ich.h @@ -20,6 +20,12 @@ #ifndef LPC_ICH_H #define LPC_ICH_H +/* Watchdog resources */ +#define ICH_RES_IO_TCO 0 +#define ICH_RES_IO_SMI 1 +#define ICH_RES_MEM_OFF 2 +#define ICH_RES_MEM_GCS 0 + /* GPIO resources */ #define ICH_RES_GPIO 0 #define ICH_RES_GPE0 1 @@ -35,6 +41,7 @@ struct lpc_ich_info { char name[32]; + unsigned int iTCO_version; unsigned int gpio_version; }; |