Merge tag 'mfd-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux-2.6-block.git] / drivers / platform / x86 / intel_pmc_ipc.c

diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
index 105cfffe82c617297d0bf348c1c5ae669060b4d2..28b2a12bb26d86c797912e518c261547f20597bf 100644 (file)
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -33,7 +33,7 @@
 #include <linux/suspend.h>
 #include <linux/acpi.h>
 #include <asm/intel_pmc_ipc.h>
-#include <linux/mfd/lpc_ich.h>
+#include <linux/platform_data/itco_wdt.h>
 
 /*
  * IPC registers
@@ -473,9 +473,9 @@ static struct resource tco_res[] = {
        },
 };
 
-static struct lpc_ich_info tco_info = {
+static struct itco_wdt_platform_data tco_info = {
        .name = "Apollo Lake SoC",
-       .iTCO_version = 3,
+       .version = 3,
 };
 
 static int ipc_create_punit_device(void)
@@ -552,8 +552,7 @@ static int ipc_create_tco_device(void)
                goto err;
        }
 
-       ret = platform_device_add_data(pdev, &tco_info,
-                                      sizeof(struct lpc_ich_info));
+       ret = platform_device_add_data(pdev, &tco_info, sizeof(tco_info));
        if (ret) {
                dev_err(ipcdev.dev, "Failed to add tco platform data\n");
                goto err;