X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fplatform%2Fx86%2Fintel_pmc_ipc.c;h=a511d518206ba274fdece09425d0983f98dedbe2;hb=bba6529ea039925ed422696be5d52677bd16643c;hp=b86e1bcaa05515a54f4b264129e279e3dc65f237;hpb=f735aa279021149ef600febe07333ad218783d79;p=cascardo%2Flinux.git

diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
index b86e1bcaa055..a511d518206b 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -651,11 +651,15 @@ static int ipc_create_pmc_devices(void)
 {
 	int ret;
 
-	ret = ipc_create_tco_device();
-	if (ret) {
-		dev_err(ipcdev.dev, "Failed to add tco platform device\n");
-		return ret;
+	/* If we have ACPI based watchdog use that instead */
+	if (!acpi_has_watchdog()) {
+		ret = ipc_create_tco_device();
+		if (ret) {
+			dev_err(ipcdev.dev, "Failed to add tco platform device\n");
+			return ret;
+		}
 	}
+
 	ret = ipc_create_punit_device();
 	if (ret) {
 		dev_err(ipcdev.dev, "Failed to add punit platform device\n");