aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2016-09-20 08:30:52 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-28 17:07:20 -0400
commit3413f702fae096184ad8bd9be9d7ecbc7c182bd7 (patch)
tree84ad807a3f3137bd0d0b0ba7157b225d6aa814e2
parent058dfc7670086edda8d34f0dbe93c596db5d4a6b (diff)
mfd: lpc_ich: Do not create iTCO watchdog when WDAT table exists
ACPI WDAT table is the preferred way to use hardware watchdog over the native iTCO_wdt. Windows only uses this table for its hardware watchdog implementation so we should be relatively safe to trust it has been validated by OEMs Prevent iTCO watchdog creation if we detect that there is ACPI WDAT table. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/mfd/lpc_ich.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index bd3aa4578346..c8dee47b45d9 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -984,6 +984,10 @@ static int lpc_ich_init_wdt(struct pci_dev *dev)
984 int ret; 984 int ret;
985 struct resource *res; 985 struct resource *res;
986 986
987 /* If we have ACPI based watchdog use that instead */
988 if (acpi_has_watchdog())
989 return -ENODEV;
990
987 /* Setup power management base register */ 991 /* Setup power management base register */
988 pci_read_config_dword(dev, priv->abase, &base_addr_cfg); 992 pci_read_config_dword(dev, priv->abase, &base_addr_cfg);
989 base_addr = base_addr_cfg & 0x0000ff80; 993 base_addr = base_addr_cfg & 0x0000ff80;