|
@@ -1,4 +1,4 @@
|
|
|
-From 3aab2704247a7ebd2acc49c6843aebddc67f3f20 Mon Sep 17 00:00:00 2001
|
|
|
+From 06ad5c909ea982d45ec4e53f9723cec4ea3b407e Mon Sep 17 00:00:00 2001
|
|
|
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
|
|
Date: Mon, 27 Jan 2020 21:16:20 +0100
|
|
|
Subject: [PATCH 7/7] ipts
|
|
@@ -2018,7 +2018,7 @@ index 000000000000..5b93add1eac2
|
|
|
+
|
|
|
+#endif /* _IPTS_STYLUS_H_ */
|
|
|
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
|
|
|
-index 87a0201ba6b3..3cf5922e8c64 100644
|
|
|
+index 5213eacc8b86..ad78fa7d72fd 100644
|
|
|
--- a/drivers/misc/mei/hw-me-regs.h
|
|
|
+++ b/drivers/misc/mei/hw-me-regs.h
|
|
|
@@ -59,6 +59,7 @@
|
|
@@ -2029,8 +2029,8 @@ index 87a0201ba6b3..3cf5922e8c64 100644
|
|
|
#define MEI_DEV_ID_SPT_H 0xA13A /* Sunrise Point H */
|
|
|
#define MEI_DEV_ID_SPT_H_2 0xA13B /* Sunrise Point H 2 */
|
|
|
|
|
|
-@@ -88,6 +89,7 @@
|
|
|
- #define MEI_DEV_ID_CMP_H_3 0x06e4 /* Comet Lake H 3 (iTouch) */
|
|
|
+@@ -90,6 +91,7 @@
|
|
|
+ #define MEI_DEV_ID_CDF 0x18D3 /* Cedar Fork */
|
|
|
|
|
|
#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */
|
|
|
+#define MEI_DEV_ID_ICP_LP_4 0x34E4 /* Ice Lake Point LP 4 (iTouch) */
|
|
@@ -2038,7 +2038,7 @@ index 87a0201ba6b3..3cf5922e8c64 100644
|
|
|
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */
|
|
|
|
|
|
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
|
|
|
-index 2711451b3d87..00d1eaa03dc7 100644
|
|
|
+index 90ee4484a80a..01fee37dd4a4 100644
|
|
|
--- a/drivers/misc/mei/pci-me.c
|
|
|
+++ b/drivers/misc/mei/pci-me.c
|
|
|
@@ -77,6 +77,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
|