Merge remote-tracking branch 'upstream/master' into feature/pkg-repo

patches/4.19/0001-surface3-power.patch

@@ -1,4 +1,4 @@
-From 1c901a05cc530f763b1e78f2dd3608acccb3f74d Mon Sep 17 00:00:00 2001
+From 173ad7941bfc2f1231e1210218fecd8416269487 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:00:43 +0200
 Subject: [PATCH 01/10] surface3-power

patches/4.19/0002-surface3-spi.patch

@@ -1,4 +1,4 @@
-From 083cd0c2a5211048c01179b7c0fb5f36d9891563 Mon Sep 17 00:00:00 2001
+From 453ea3f94fd2c3d7f944864d55196d1f9577bb8e Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Subject: [PATCH 02/10] surface3-spi

patches/4.19/0003-surface3-oemb.patch

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

patches/4.19/0004-surface-buttons.patch

@@ -1,4 +1,4 @@
-From 73b1b21ad56e73a9c33e93df9e10a5ce28b00dd5 Mon Sep 17 00:00:00 2001
+From 40baf1bc4739c49334e9b6dc7badc44771c5ee4a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Jul 2019 17:51:37 +0200
 Subject: [PATCH 04/10] surface-buttons

patches/4.19/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From 84a947d275f9d1bd02854f402f2e5867eb7772a0 Mon Sep 17 00:00:00 2001
+From 4c686fa01f273b247473bdf2399ab3886aab8831 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Mon, 26 Aug 2019 01:15:40 +0200
 Subject: [PATCH 05/10] surface-sam

patches/4.19/0006-suspend.patch

@@ -1,4 +1,4 @@
-From 9f416015d2889678dc4cb6eee7e7f62ceac27e02 Mon Sep 17 00:00:00 2001
+From 56465e5f753dd383417dc9d22532d4b4c7d70e14 Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Sat, 28 Sep 2019 17:48:21 +0200
 Subject: [PATCH 06/10] suspend

patches/4.19/0007-ipts.patch

@@ -1,4 +1,4 @@
-From f75f69ab7c9af49ceedabfdd5fedc3bb44375f01 Mon Sep 17 00:00:00 2001
+From 3aa4577c1327da13ed2cece7174da5ee7153d570 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 17:58:17 +0200
 Subject: [PATCH 07/10] ipts
@@ -7117,7 +7117,7 @@ index 000000000000..ef73d28db47c
 +
 +#endif // _IPTS_STATE_H_
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index 9c4042420022..5d63ebba3e9f 100644
+index d80372d21c14..6e14bde0a819 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -119,6 +119,7 @@
@@ -7129,7 +7129,7 @@ index 9c4042420022..5d63ebba3e9f 100644
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 41a10e392839..2b93a067cebc 100644
+index 3498c10b8263..4442c6366f0d 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -86,6 +86,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {

patches/4.19/0008-surface-lte.patch

@@ -1,4 +1,4 @@
-From 21bd7d9f54af1f143b4018d53315ff0798cb6b62 Mon Sep 17 00:00:00 2001
+From 4b4d681cceaa20cf93fd2e6afa93a8fb93f528ad Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:02:03 +0200
 Subject: [PATCH 08/10] surface-lte

patches/4.19/0009-ioremap_uc.patch

@@ -1,4 +1,4 @@
-From 30b3275ff57c77da523db26582675c74e0cceee1 Mon Sep 17 00:00:00 2001
+From 6405ace9361dabd32a7c47e989de5aa8f005be0d Mon Sep 17 00:00:00 2001
 From: Tuowen Zhao <ztuowen@gmail.com>
 Date: Wed, 16 Oct 2019 15:06:28 -0600
 Subject: [PATCH 09/10] ioremap_uc

patches/4.19/0010-wifi.patch

@@ -1,4 +1,4 @@
-From 9715bc9a94fa7b9f30b3b12a6a09160a9aca43ec Mon Sep 17 00:00:00 2001
+From 0ddca72e89d8d512ec8ba779be709c7be185aca2 Mon Sep 17 00:00:00 2001
 From: sebanc <22224731+sebanc@users.noreply.github.com>
 Date: Mon, 4 Nov 2019 09:30:57 +0100
 Subject: [PATCH 10/10] wifi

patches/5.4/0001-surface3-power.patch

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

patches/5.4/0002-surface3-spi.patch

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

patches/5.4/0003-surface3-oemb.patch

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

patches/5.4/0004-ioremap_uc.patch

@@ -1,4 +1,4 @@
-From 5d9684cf5e5ad7441a0d8b11c04e23e44ba57fa1 Mon Sep 17 00:00:00 2001
+From 83aa487e4c43e598ee3e5266e79573ba6e0a3ab7 Mon Sep 17 00:00:00 2001
 From: Tuowen Zhao <ztuowen@gmail.com>
 Date: Wed, 16 Oct 2019 15:06:28 -0600
 Subject: [PATCH 4/7] ioremap_uc

patches/5.4/0005-surface-sam.patch

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

patches/5.4/0006-surface-lte.patch

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

patches/5.4/0007-wifi.patch

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

patches/5.5/0001-surface3-power.patch

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

patches/5.5/0002-surface3-spi.patch

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

patches/5.5/0003-surface3-oemb.patch

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

patches/5.5/0004-surface-sam.patch

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

patches/5.5/0005-surface-lte.patch

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

patches/5.5/0006-wifi.patch

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

patches/5.5/0007-ipts.patch

@@ -1,4 +1,4 @@
-From 3e83aa79daed3c26b4b525cb0a4314f9a3ef6035 Mon Sep 17 00:00:00 2001
+From a229e405b925f6d740e16a34edd014d9344aa520 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
@@ -13,7 +13,7 @@ Subject: [PATCH 7/7] ipts
  drivers/input/touchscreen/ipts/control.h      |  18 ++
  drivers/input/touchscreen/ipts/devices.c      |  46 +++
  drivers/input/touchscreen/ipts/devices.h      |  33 +++
- drivers/input/touchscreen/ipts/hid.c          | 122 ++++++++
+ drivers/input/touchscreen/ipts/hid.c          | 126 +++++++++
  drivers/input/touchscreen/ipts/hid.h          |  17 ++
  drivers/input/touchscreen/ipts/init.c         |  93 ++++++
  drivers/input/touchscreen/ipts/math.c         | 103 +++++++
@@ -36,7 +36,7 @@ Subject: [PATCH 7/7] ipts
  drivers/misc/mei/hw-me-regs.h                 |   2 +
  drivers/misc/mei/pci-me.c                     |   2 +
  include/uapi/linux/input.h                    |   1 +
- 32 files changed, 1591 insertions(+)
+ 32 files changed, 1595 insertions(+)
  create mode 100644 drivers/input/touchscreen/ipts/Kconfig
  create mode 100644 drivers/input/touchscreen/ipts/Makefile
  create mode 100644 drivers/input/touchscreen/ipts/context.h
@@ -415,10 +415,10 @@ index 000000000000..9bf8da9fbfab
 +#endif /* _IPTS_DEVICES_H_ */
 diff --git a/drivers/input/touchscreen/ipts/hid.c b/drivers/input/touchscreen/ipts/hid.c
 new file mode 100644
-index 000000000000..c9f27b0e3b75
+index 000000000000..866e8f02864f
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/hid.c
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,126 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later
 +
 +#include <linux/delay.h>
@@ -439,7 +439,11 @@ index 000000000000..c9f27b0e3b75
 +		struct ipts_context *ipts, struct ipts_touch_data *data)
 +{
 +	// If the buffer contains HID data, we are in single touch mode
-+	if (data->type == IPTS_TOUCH_DATA_TYPE_HID_REPORT)
++	//
++	// On gen7 IPTS will send other data using HID reports,
++	// so we have to additionally filter out the touch reports.
++	if (data->type == IPTS_TOUCH_DATA_TYPE_HID_REPORT &&
++			data->data[0] == 0x40)
 +		return IPTS_REPORT_TYPE_SINGLETOUCH;
 +
 +	// If the buffer doesn't contain touch data
@@ -1834,7 +1838,7 @@ index 000000000000..3b6424ade542
 +
 +#endif /* _IPTS_STYLUS_H_ */
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index 7cd67fb2365d..b6c685e861f9 100644
+index 87a0201ba6b3..3cf5922e8c64 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -59,6 +59,7 @@
@@ -1845,16 +1849,16 @@ index 7cd67fb2365d..b6c685e861f9 100644
  #define MEI_DEV_ID_SPT_H      0xA13A  /* Sunrise Point H */
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  
-@@ -84,6 +85,7 @@
- #define MEI_DEV_ID_CMP_V      0xA3BA  /* Comet Point Lake V */
+@@ -88,6 +89,7 @@
+ #define MEI_DEV_ID_CMP_H_3    0x06e4  /* Comet Lake H 3 (iTouch) */
  
  #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_TGP_LP     0xA0E0  /* Tiger Lake Point LP */
+ #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 c845b7e40f26..0d1a13bb406a 100644
+index 2711451b3d87..00d1eaa03dc7 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[] = {
@@ -1865,8 +1869,8 @@ index c845b7e40f26..0d1a13bb406a 100644
  	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_CFG)},
  	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_CFG)},
  	{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)},
-@@ -101,6 +102,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
- 	{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_V, MEI_ME_PCH12_CFG)},
+@@ -103,6 +104,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_H_3, MEI_ME_PCH8_CFG)},
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
 +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP_4, MEI_ME_PCH12_CFG)},