Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / drivers / mfd / lpc_ich.c

diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index d98a5d974092227e42ddd37e4431886efccad1ea..773f1554d2f9514ee5e9d32cedda4da88cc94a68 100644 (file)
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -227,6 +227,8 @@ enum lpc_chipsets {
        LPC_LEWISBURG,  /* Lewisburg */
        LPC_9S,         /* 9 Series */
        LPC_APL,        /* Apollo Lake SoC */
+       LPC_GLK,        /* Gemini Lake SoC */
+       LPC_COUGARMOUNTAIN,/* Cougar Mountain SoC*/
 };
 
 static struct lpc_ich_info lpc_chipset_info[] = {
@@ -554,6 +556,14 @@ static struct lpc_ich_info lpc_chipset_info[] = {
                .iTCO_version = 5,
                .spi_type = INTEL_SPI_BXT,
        },
+       [LPC_GLK] = {
+               .name = "Gemini Lake SoC",
+               .spi_type = INTEL_SPI_BXT,
+       },
+       [LPC_COUGARMOUNTAIN] = {
+               .name = "Cougar Mountain SoC",
+               .iTCO_version = 3,
+       },
 };
 
 /*
@@ -682,6 +692,8 @@ static const struct pci_device_id lpc_ich_ids[] = {
        { PCI_VDEVICE(INTEL, 0x2917), LPC_ICH9ME},
        { PCI_VDEVICE(INTEL, 0x2918), LPC_ICH9},
        { PCI_VDEVICE(INTEL, 0x2919), LPC_ICH9M},
+       { PCI_VDEVICE(INTEL, 0x3197), LPC_GLK},
+       { PCI_VDEVICE(INTEL, 0x2b9c), LPC_COUGARMOUNTAIN},
        { PCI_VDEVICE(INTEL, 0x3a14), LPC_ICH10DO},
        { PCI_VDEVICE(INTEL, 0x3a16), LPC_ICH10R},
        { PCI_VDEVICE(INTEL, 0x3a18), LPC_ICH10},