瀏覽代碼

Update patches

Rebased to 5.5.16 and 5.6.3 because of an added MEI device ID

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
Dorian Stoll 5 年之前
父節點
當前提交
1b80351c00

+ 1 - 1
patches/5.5/0001-surface3-power.patch

@@ -1,4 +1,4 @@
-From e071e858f883c0dd91ed72e2809573264b446524 Mon Sep 17 00:00:00 2001
+From 7ff8af657fd5d92cef720267b19af2f5dbd2a928 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 From: qzed <qzed@users.noreply.github.com>
 Date: Tue, 17 Sep 2019 17:17:56 +0200
 Date: Tue, 17 Sep 2019 17:17:56 +0200
 Subject: [PATCH 1/7] surface3-power
 Subject: [PATCH 1/7] surface3-power

+ 1 - 1
patches/5.5/0002-surface3-spi.patch

@@ -1,4 +1,4 @@
-From 9dbd1036ec146ab0b1c0fbdb818f5e260281ecbb Mon Sep 17 00:00:00 2001
+From e28983df3390b7c432052691a845790bbcdcc41b Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Subject: [PATCH 2/7] surface3-spi
 Subject: [PATCH 2/7] surface3-spi

+ 1 - 1
patches/5.5/0003-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 9f43fdb0ceefb548c39885cd5b54ea3c284aa4db Mon Sep 17 00:00:00 2001
+From a65010761200bb3bfa454e84a9a66518cc10240b Mon Sep 17 00:00:00 2001
 From: Chih-Wei Huang <cwhuang@linux.org.tw>
 From: Chih-Wei Huang <cwhuang@linux.org.tw>
 Date: Tue, 18 Sep 2018 11:01:37 +0800
 Date: Tue, 18 Sep 2018 11:01:37 +0800
 Subject: [PATCH 3/7] surface3-oemb
 Subject: [PATCH 3/7] surface3-oemb

+ 1 - 1
patches/5.5/0004-surface-sam.patch

@@ -1,4 +1,4 @@
-From 45ed13097d294c78ced0b0430d292b26faa4e2cf Mon Sep 17 00:00:00 2001
+From 00dffb19f2165b263b6dac434a70021c9bd3ea9e Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 From: qzed <qzed@users.noreply.github.com>
 Date: Mon, 26 Aug 2019 01:11:08 +0200
 Date: Mon, 26 Aug 2019 01:11:08 +0200
 Subject: [PATCH 4/7] surface-sam
 Subject: [PATCH 4/7] surface-sam

+ 1 - 1
patches/5.5/0005-surface-lte.patch

@@ -1,4 +1,4 @@
-From cd26a693cd81df5c65072e55c68ff8439dd86c8a Mon Sep 17 00:00:00 2001
+From eeccedd8f02394379b4fae6a396a19057dc8955f Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 From: qzed <qzed@users.noreply.github.com>
 Date: Tue, 17 Sep 2019 17:21:43 +0200
 Date: Tue, 17 Sep 2019 17:21:43 +0200
 Subject: [PATCH 5/7] surface-lte
 Subject: [PATCH 5/7] surface-lte

+ 1 - 1
patches/5.5/0006-wifi.patch

@@ -1,4 +1,4 @@
-From a5d582724403b17bfef0ce7099afd84a24ecb18e Mon Sep 17 00:00:00 2001
+From a3b5cbab95f51e6923be2d6c3dca5482cae46468 Mon Sep 17 00:00:00 2001
 From: sebanc <22224731+sebanc@users.noreply.github.com>
 From: sebanc <22224731+sebanc@users.noreply.github.com>
 Date: Mon, 4 Nov 2019 09:30:57 +0100
 Date: Mon, 4 Nov 2019 09:30:57 +0100
 Subject: [PATCH 6/7] wifi
 Subject: [PATCH 6/7] wifi

+ 5 - 5
patches/5.5/0007-ipts.patch

@@ -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>
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 27 Jan 2020 21:16:20 +0100
 Date: Mon, 27 Jan 2020 21:16:20 +0100
 Subject: [PATCH 7/7] ipts
 Subject: [PATCH 7/7] ipts
@@ -2018,7 +2018,7 @@ index 000000000000..5b93add1eac2
 +
 +
 +#endif /* _IPTS_STYLUS_H_ */
 +#endif /* _IPTS_STYLUS_H_ */
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.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
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -59,6 +59,7 @@
 @@ -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      0xA13A  /* Sunrise Point H */
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  #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     0x34E0  /* Ice Lake Point LP */
 +#define MEI_DEV_ID_ICP_LP_4   0x34E4  /* Ice Lake Point LP 4 (iTouch) */
 +#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 */
  #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
 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
 --- a/drivers/misc/mei/pci-me.c
 +++ b/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[] = {
 @@ -77,6 +77,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {

+ 1 - 1
patches/5.6/0001-surface3-power.patch

@@ -1,4 +1,4 @@
-From e784410139d3e1ba337a5e198280502e5cc710f0 Mon Sep 17 00:00:00 2001
+From f974a4ea688f50cdda4c3c0f574cba95a86a0cc8 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 From: qzed <qzed@users.noreply.github.com>
 Date: Tue, 17 Sep 2019 17:17:56 +0200
 Date: Tue, 17 Sep 2019 17:17:56 +0200
 Subject: [PATCH 1/7] surface3-power
 Subject: [PATCH 1/7] surface3-power

+ 1 - 1
patches/5.6/0002-surface3-spi.patch

@@ -1,4 +1,4 @@
-From 8e51a8d67ca029de2b4ff81f80759103284833eb Mon Sep 17 00:00:00 2001
+From 4f7f5034f9f182c152396bf7c44b98da165d81d1 Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Subject: [PATCH 2/7] surface3-spi
 Subject: [PATCH 2/7] surface3-spi

+ 1 - 1
patches/5.6/0003-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 8bb89389e0c9c1f25b28ec32c8ebc990bf91c7ca Mon Sep 17 00:00:00 2001
+From 536bf656e5e07386fe586c3d644695e7992fc38f Mon Sep 17 00:00:00 2001
 From: Chih-Wei Huang <cwhuang@linux.org.tw>
 From: Chih-Wei Huang <cwhuang@linux.org.tw>
 Date: Tue, 18 Sep 2018 11:01:37 +0800
 Date: Tue, 18 Sep 2018 11:01:37 +0800
 Subject: [PATCH 3/7] surface3-oemb
 Subject: [PATCH 3/7] surface3-oemb

+ 1 - 1
patches/5.6/0004-surface-sam.patch

@@ -1,4 +1,4 @@
-From 45c68e8472cab23d0c613c253dbdb910d8ad6960 Mon Sep 17 00:00:00 2001
+From 4d2963eea4ac2d2ca1415261e0fefd4c82e9c228 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 6 Dec 2019 11:56:12 +0100
 Date: Fri, 6 Dec 2019 11:56:12 +0100
 Subject: [PATCH 4/7] surface-sam
 Subject: [PATCH 4/7] surface-sam

+ 1 - 1
patches/5.6/0005-surface-lte.patch

@@ -1,4 +1,4 @@
-From ae6919f0d34d7544fee84e194ab012a991c91509 Mon Sep 17 00:00:00 2001
+From deea0061b5a8081405da5c6f46b76187fac6b3eb Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 From: qzed <qzed@users.noreply.github.com>
 Date: Tue, 17 Sep 2019 17:21:43 +0200
 Date: Tue, 17 Sep 2019 17:21:43 +0200
 Subject: [PATCH 5/7] surface-lte
 Subject: [PATCH 5/7] surface-lte

+ 1 - 1
patches/5.6/0006-wifi.patch

@@ -1,4 +1,4 @@
-From 45bbf4df63490b6d7d6bb7d0bfb36428fe5b9cfe Mon Sep 17 00:00:00 2001
+From c94bc5af045defd9f41bbbd5edc0ef24b38b0b84 Mon Sep 17 00:00:00 2001
 From: sebanc <22224731+sebanc@users.noreply.github.com>
 From: sebanc <22224731+sebanc@users.noreply.github.com>
 Date: Mon, 4 Nov 2019 09:30:57 +0100
 Date: Mon, 4 Nov 2019 09:30:57 +0100
 Subject: [PATCH 6/7] wifi
 Subject: [PATCH 6/7] wifi

+ 5 - 5
patches/5.6/0007-ipts.patch

@@ -1,4 +1,4 @@
-From 784492d8a39f9c865430fb8c21bd313794a27f35 Mon Sep 17 00:00:00 2001
+From 2458faf694596f3fc8bead2deee2651953f9192e Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 27 Jan 2020 21:16:20 +0100
 Date: Mon, 27 Jan 2020 21:16:20 +0100
 Subject: [PATCH 7/7] ipts
 Subject: [PATCH 7/7] ipts
@@ -2018,7 +2018,7 @@ index 000000000000..5b93add1eac2
 +
 +
 +#endif /* _IPTS_STYLUS_H_ */
 +#endif /* _IPTS_STYLUS_H_ */
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.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
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -59,6 +59,7 @@
 @@ -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      0xA13A  /* Sunrise Point H */
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  #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     0x34E0  /* Ice Lake Point LP */
 +#define MEI_DEV_ID_ICP_LP_4   0x34E4  /* Ice Lake Point LP 4 (iTouch) */
 +#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 */
  #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
 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
 --- a/drivers/misc/mei/pci-me.c
 +++ b/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[] = {
 @@ -77,6 +77,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {