aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2016-09-12 09:21:43 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 09:32:29 -0400
commitac182e8abc6f93c1c4cc12f042af64c9d7be0d1e (patch)
treefdc8a6b422e12e892626f96f1d9e72a504af122a /drivers/misc
parent0ef7528d15c2981d315c5dd45917559e47d5149d (diff)
mei: me: add kaby point device ids
Add device ids for Intel Kabypoint PCH (Kabylake) Cc: <stable@vger.kernel.org> #4.6+ Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/hw-me-regs.h3
-rw-r--r--drivers/misc/mei/pci-me.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 0dcb854b4bfc..7ad15d678878 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -125,6 +125,9 @@
125#define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */ 125#define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */
126#define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */ 126#define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */
127 127
128#define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */
129#define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */
130
128/* 131/*
129 * MEI HW Section 132 * MEI HW Section
130 */ 133 */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 031e7c92fcc7..e85bb371c87d 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -91,6 +91,9 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
91 {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)}, 91 {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)},
92 {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)}, 92 {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
93 93
94 {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},
95 {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},
96
94 /* required last entry */ 97 /* required last entry */
95 {0, } 98 {0, }
96}; 99};