Update v5.7 patches

Changes:
  SAM:
    - Add support for Surface Book 3 in Surface HPS driver. The dGPU of
      the Surface Book 3 can now be turned on and off via the same
      mechanism already being used by the Surface Book 2.
    - Add SID devices for Surface Pro 6 with MSHW0111 ID.
    - Complete restructure of Surface Serial Hub driver internals. The
      old synchronous communication core has been replaced by a
      completely asynchronous implementation.
    - Misc. code improvements and clean-up.

References:
  kernel: https://github.com/linux-surface/kernel/commit/29c5a7fc9a3fc6955caf9a256d664d94aff1862f
  SAM: https://github.com/linux-surface/surface-aggregator-module/commit/6715faf265fd275aec0f5fab253cceecc9e5044e

patches/5.7/0001-surface3-spi.patch

@@ -1,14 +1,14 @@
-From 5c1cbb27c329d752b2a99d575c6b89880d5b3da9 Mon Sep 17 00:00:00 2001
+From 958fe8d5b88c5a0bf9aab4b7067faeb64ddbcb84 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 1/6] surface3-spi
+Subject: [PATCH 1/5] surface3-spi
 
 ---
  drivers/input/touchscreen/surface3_spi.c | 26 ++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 diff --git a/drivers/input/touchscreen/surface3_spi.c b/drivers/input/touchscreen/surface3_spi.c
-index ce4828b1415a..63b0b8ddf090 100644
+index ce4828b1415a8..63b0b8ddf0903 100644
 --- a/drivers/input/touchscreen/surface3_spi.c
 +++ b/drivers/input/touchscreen/surface3_spi.c
 @@ -25,6 +25,12 @@
@@ -59,5 +59,5 @@ index ce4828b1415a..63b0b8ddf090 100644
  }
  
 -- 
-2.26.2
+2.27.0
 

patches/5.7/0002-surface3-oemb.patch

@@ -1,7 +1,7 @@
-From ef5e39a3b04084700b6e12a37084a23816f4c490 Mon Sep 17 00:00:00 2001
+From 61ee8776a9b967941b7de9f2eb2ba7f7b23d5bea 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 2/6] surface3-oemb
+Subject: [PATCH 2/5] surface3-oemb
 
 ---
  drivers/platform/x86/surface3-wmi.c               | 7 +++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 2/6] surface3-oemb
  3 files changed, 24 insertions(+)
 
 diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c
-index 130b6f52a600..801083aa56d6 100644
+index 130b6f52a6001..801083aa56d6d 100644
 --- a/drivers/platform/x86/surface3-wmi.c
 +++ b/drivers/platform/x86/surface3-wmi.c
 @@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
@@ -28,10 +28,10 @@ index 130b6f52a600..801083aa56d6 100644
  	{ }
  };
 diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
-index 6ba1849a77b0..f3750f30a8f9 100644
+index e2e1d5b03b381..5ff38592ba6db 100644
 --- a/sound/soc/codecs/rt5645.c
 +++ b/sound/soc/codecs/rt5645.c
-@@ -3681,6 +3681,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
+@@ -3687,6 +3687,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
  		},
  		.driver_data = (void *)&intel_braswell_platform_data,
  	},
@@ -48,7 +48,7 @@ index 6ba1849a77b0..f3750f30a8f9 100644
  		/*
  		 * Match for the GPDwin which unfortunately uses somewhat
 diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
-index 2752dc955733..ef36a316e2ed 100644
+index 2752dc9557334..ef36a316e2ed6 100644
 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
 +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
 @@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
@@ -67,5 +67,5 @@ index 2752dc955733..ef36a316e2ed 100644
  };
  
 -- 
-2.26.2
+2.27.0
 

patches/5.7/0005-wifi.patch → patches/5.7/0004-wifi.patch

@@ -1,7 +1,7 @@
-From 4de73f0cda4a88b4a172f2c1ff30c38d1dafba51 Mon Sep 17 00:00:00 2001
+From 6850f4f3a40f424ee2bdde18e906e0477632858f Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
-Date: Mon, 4 Nov 2019 09:30:57 +0100
-Subject: [PATCH 5/6] wifi
+Date: Thu, 20 Feb 2020 16:51:11 +0900
+Subject: [PATCH 4/5] wifi
 
 ---
  .../net/wireless/marvell/mwifiex/cfg80211.c   | 26 ++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 5/6] wifi
  3 files changed, 84 insertions(+), 57 deletions(-)
 
 diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-index 1566d2197906..31ddb29c72ab 100644
+index 12bfd653a4052..68404a1767945 100644
 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
 +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
 @@ -25,6 +25,11 @@
@@ -54,7 +54,7 @@ index 1566d2197906..31ddb29c72ab 100644
  }
  
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
-index 87b4ccca4b9a..3bdad5e80ecb 100644
+index 87b4ccca4b9a2..3bdad5e80ecbb 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
 @@ -146,38 +146,45 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter)
@@ -188,7 +188,7 @@ index 87b4ccca4b9a..3bdad5e80ecb 100644
  		 pdev->vendor, pdev->device, pdev->revision);
  
 diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-index 0bd93f26bd7f..91b03423c09d 100644
+index 0bd93f26bd7f8..91b03423c09d0 100644
 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
 +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
 @@ -2254,7 +2254,6 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
@@ -251,5 +251,5 @@ index 0bd93f26bd7f..91b03423c09d 100644
  	if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
  		/* Send cmd to FW to enable/disable 11D function */
 -- 
-2.26.2
+2.27.0
 

patches/5.7/0006-ipts.patch → patches/5.7/0005-ipts.patch

@@ -1,7 +1,7 @@
-From 41aff18e80184e63b3274f4270bccd1d771e1b01 Mon Sep 17 00:00:00 2001
+From c93b8d108a9af691cf7309f16bac0d8ce87b86f4 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 6/6] ipts
+Subject: [PATCH 5/5] ipts
 
 ---
  drivers/input/touchscreen/Kconfig             |   2 +
@@ -76,7 +76,7 @@ Subject: [PATCH 6/6] ipts
  create mode 100644 drivers/input/touchscreen/ipts/stylus.h
 
 diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
-index c071f7c407b6..028ff55d779d 100644
+index c071f7c407b61..028ff55d779d0 100644
 --- a/drivers/input/touchscreen/Kconfig
 +++ b/drivers/input/touchscreen/Kconfig
 @@ -1310,4 +1310,6 @@ config TOUCHSCREEN_IQS5XX
@@ -87,7 +87,7 @@ index c071f7c407b6..028ff55d779d 100644
 +
  endif
 diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
-index 94c6162409b3..864f0e092ab6 100644
+index 94c6162409b37..864f0e092ab67 100644
 --- a/drivers/input/touchscreen/Makefile
 +++ b/drivers/input/touchscreen/Makefile
 @@ -45,6 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_EXC3000)	+= exc3000.o
@@ -100,7 +100,7 @@ index 94c6162409b3..864f0e092ab6 100644
  obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o
 diff --git a/drivers/input/touchscreen/ipts/Kconfig b/drivers/input/touchscreen/ipts/Kconfig
 new file mode 100644
-index 000000000000..d3c530dafa94
+index 0000000000000..d3c530dafa948
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/Kconfig
 @@ -0,0 +1,16 @@
@@ -122,7 +122,7 @@ index 000000000000..d3c530dafa94
 +	  module will be called ipts.
 diff --git a/drivers/input/touchscreen/ipts/Makefile b/drivers/input/touchscreen/ipts/Makefile
 new file mode 100644
-index 000000000000..0f7c904e7317
+index 0000000000000..0f7c904e73171
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/Makefile
 @@ -0,0 +1,17 @@
@@ -145,7 +145,7 @@ index 000000000000..0f7c904e7317
 +ipts-objs += stylus.o
 diff --git a/drivers/input/touchscreen/ipts/context.h b/drivers/input/touchscreen/ipts/context.h
 new file mode 100644
-index 000000000000..ab26552579a5
+index 0000000000000..ab26552579a5c
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/context.h
 @@ -0,0 +1,60 @@
@@ -211,7 +211,7 @@ index 000000000000..ab26552579a5
 +#endif /* _IPTS_CONTEXT_H_ */
 diff --git a/drivers/input/touchscreen/ipts/control.c b/drivers/input/touchscreen/ipts/control.c
 new file mode 100644
-index 000000000000..9179eca66558
+index 0000000000000..9179eca665585
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/control.c
 @@ -0,0 +1,94 @@
@@ -311,7 +311,7 @@ index 000000000000..9179eca66558
 +}
 diff --git a/drivers/input/touchscreen/ipts/control.h b/drivers/input/touchscreen/ipts/control.h
 new file mode 100644
-index 000000000000..e57609c85d62
+index 0000000000000..e57609c85d62a
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/control.h
 @@ -0,0 +1,18 @@
@@ -335,7 +335,7 @@ index 000000000000..e57609c85d62
 +#endif /* _IPTS_CONTROL_H_ */
 diff --git a/drivers/input/touchscreen/ipts/data.c b/drivers/input/touchscreen/ipts/data.c
 new file mode 100644
-index 000000000000..568bf04f7ea6
+index 0000000000000..568bf04f7ea6e
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/data.c
 @@ -0,0 +1,107 @@
@@ -448,7 +448,7 @@ index 000000000000..568bf04f7ea6
 +}
 diff --git a/drivers/input/touchscreen/ipts/data.h b/drivers/input/touchscreen/ipts/data.h
 new file mode 100644
-index 000000000000..fa72c1be0945
+index 0000000000000..fa72c1be09451
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/data.h
 @@ -0,0 +1,12 @@
@@ -466,7 +466,7 @@ index 000000000000..fa72c1be0945
 +#endif /* _IPTS_DATA_H_ */
 diff --git a/drivers/input/touchscreen/ipts/hid.c b/drivers/input/touchscreen/ipts/hid.c
 new file mode 100644
-index 000000000000..2642990b8c42
+index 0000000000000..2642990b8c420
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/hid.c
 @@ -0,0 +1,38 @@
@@ -510,7 +510,7 @@ index 000000000000..2642990b8c42
 +}
 diff --git a/drivers/input/touchscreen/ipts/hid.h b/drivers/input/touchscreen/ipts/hid.h
 new file mode 100644
-index 000000000000..e6cf38fce454
+index 0000000000000..e6cf38fce4541
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/hid.h
 @@ -0,0 +1,13 @@
@@ -529,7 +529,7 @@ index 000000000000..e6cf38fce454
 +#endif /* _IPTS_HID_H_ */
 diff --git a/drivers/input/touchscreen/ipts/init.c b/drivers/input/touchscreen/ipts/init.c
 new file mode 100644
-index 000000000000..fb70d55542af
+index 0000000000000..fb70d55542af7
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/init.c
 @@ -0,0 +1,93 @@
@@ -628,7 +628,7 @@ index 000000000000..fb70d55542af
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/input/touchscreen/ipts/math.c b/drivers/input/touchscreen/ipts/math.c
 new file mode 100644
-index 000000000000..df956e5447e0
+index 0000000000000..df956e5447e03
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/math.c
 @@ -0,0 +1,103 @@
@@ -737,7 +737,7 @@ index 000000000000..df956e5447e0
 +}
 diff --git a/drivers/input/touchscreen/ipts/math.h b/drivers/input/touchscreen/ipts/math.h
 new file mode 100644
-index 000000000000..8e831074ab60
+index 0000000000000..8e831074ab60b
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/math.h
 @@ -0,0 +1,21 @@
@@ -764,7 +764,7 @@ index 000000000000..8e831074ab60
 +#endif /* _IPTS_MATH_H_ */
 diff --git a/drivers/input/touchscreen/ipts/params.c b/drivers/input/touchscreen/ipts/params.c
 new file mode 100644
-index 000000000000..6aa3f5cf1d76
+index 0000000000000..6aa3f5cf1d762
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/params.c
 @@ -0,0 +1,27 @@
@@ -797,7 +797,7 @@ index 000000000000..6aa3f5cf1d76
 +);
 diff --git a/drivers/input/touchscreen/ipts/params.h b/drivers/input/touchscreen/ipts/params.h
 new file mode 100644
-index 000000000000..1f992a3bc21b
+index 0000000000000..1f992a3bc21b9
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/params.h
 @@ -0,0 +1,15 @@
@@ -818,7 +818,7 @@ index 000000000000..1f992a3bc21b
 +#endif /* _IPTS_PARAMS_H_ */
 diff --git a/drivers/input/touchscreen/ipts/payload.c b/drivers/input/touchscreen/ipts/payload.c
 new file mode 100644
-index 000000000000..3572ddc0f2fb
+index 0000000000000..3572ddc0f2fb0
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/payload.c
 @@ -0,0 +1,52 @@
@@ -876,7 +876,7 @@ index 000000000000..3572ddc0f2fb
 +}
 diff --git a/drivers/input/touchscreen/ipts/payload.h b/drivers/input/touchscreen/ipts/payload.h
 new file mode 100644
-index 000000000000..6603714bb6fd
+index 0000000000000..6603714bb6fd0
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/payload.h
 @@ -0,0 +1,14 @@
@@ -896,7 +896,7 @@ index 000000000000..6603714bb6fd
 +#endif /* _IPTS_PAYLOAD_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/commands.h b/drivers/input/touchscreen/ipts/protocol/commands.h
 new file mode 100644
-index 000000000000..2533dfb13584
+index 0000000000000..2533dfb13584a
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/commands.h
 @@ -0,0 +1,61 @@
@@ -963,7 +963,7 @@ index 000000000000..2533dfb13584
 +#endif /* _IPTS_PROTOCOL_COMMANDS_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/data.h b/drivers/input/touchscreen/ipts/protocol/data.h
 new file mode 100644
-index 000000000000..148e0545b2e4
+index 0000000000000..148e0545b2e4e
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/data.h
 @@ -0,0 +1,30 @@
@@ -999,7 +999,7 @@ index 000000000000..148e0545b2e4
 +#endif /* _IPTS_PROTOCOL_DATA_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/events.h b/drivers/input/touchscreen/ipts/protocol/events.h
 new file mode 100644
-index 000000000000..f8b771f90bd2
+index 0000000000000..f8b771f90bd2b
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/events.h
 @@ -0,0 +1,29 @@
@@ -1034,7 +1034,7 @@ index 000000000000..f8b771f90bd2
 +#endif /* _IPTS_PROTOCOL_EVENTS_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/feedback.h b/drivers/input/touchscreen/ipts/protocol/feedback.h
 new file mode 100644
-index 000000000000..8b3d8b689ee8
+index 0000000000000..8b3d8b689ee83
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/feedback.h
 @@ -0,0 +1,30 @@
@@ -1070,7 +1070,7 @@ index 000000000000..8b3d8b689ee8
 +#endif /* _IPTS_PROTOCOL_FEEDBACK_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/payload.h b/drivers/input/touchscreen/ipts/protocol/payload.h
 new file mode 100644
-index 000000000000..f46da4ea81f2
+index 0000000000000..f46da4ea81f25
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/payload.h
 @@ -0,0 +1,47 @@
@@ -1123,7 +1123,7 @@ index 000000000000..f46da4ea81f2
 +#endif /* _IPTS_PROTOCOL_PAYLOAD_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/responses.h b/drivers/input/touchscreen/ipts/protocol/responses.h
 new file mode 100644
-index 000000000000..27153d82a5d6
+index 0000000000000..27153d82a5d67
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/responses.h
 @@ -0,0 +1,62 @@
@@ -1191,7 +1191,7 @@ index 000000000000..27153d82a5d6
 +#endif /* _IPTS_PROTOCOL_RESPONSES_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/singletouch.h b/drivers/input/touchscreen/ipts/protocol/singletouch.h
 new file mode 100644
-index 000000000000..bf9912ee2af4
+index 0000000000000..bf9912ee2af4c
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/singletouch.h
 @@ -0,0 +1,17 @@
@@ -1214,7 +1214,7 @@ index 000000000000..bf9912ee2af4
 +#endif /* _IPTS_PROTOCOL_SINGLETOUCH_H_ */
 diff --git a/drivers/input/touchscreen/ipts/protocol/stylus.h b/drivers/input/touchscreen/ipts/protocol/stylus.h
 new file mode 100644
-index 000000000000..950850b365df
+index 0000000000000..950850b365dfb
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/stylus.h
 @@ -0,0 +1,52 @@
@@ -1272,7 +1272,7 @@ index 000000000000..950850b365df
 +#endif /* _IPTS_PAYLOAD_STYLUS_H_ */
 diff --git a/drivers/input/touchscreen/ipts/receiver.c b/drivers/input/touchscreen/ipts/receiver.c
 new file mode 100644
-index 000000000000..ab283994c3e5
+index 0000000000000..ab283994c3e5f
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/receiver.c
 @@ -0,0 +1,265 @@
@@ -1543,7 +1543,7 @@ index 000000000000..ab283994c3e5
 +}
 diff --git a/drivers/input/touchscreen/ipts/receiver.h b/drivers/input/touchscreen/ipts/receiver.h
 new file mode 100644
-index 000000000000..4d413a0abd4c
+index 0000000000000..4d413a0abd4c5
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/receiver.h
 @@ -0,0 +1,8 @@
@@ -1557,7 +1557,7 @@ index 000000000000..4d413a0abd4c
 +#endif /* _IPTS_RECEIVER_H_ */
 diff --git a/drivers/input/touchscreen/ipts/resources.c b/drivers/input/touchscreen/ipts/resources.c
 new file mode 100644
-index 000000000000..704db9fdd3fd
+index 0000000000000..704db9fdd3fd4
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/resources.c
 @@ -0,0 +1,131 @@
@@ -1694,7 +1694,7 @@ index 000000000000..704db9fdd3fd
 +}
 diff --git a/drivers/input/touchscreen/ipts/resources.h b/drivers/input/touchscreen/ipts/resources.h
 new file mode 100644
-index 000000000000..cf9807b0dbe6
+index 0000000000000..cf9807b0dbe62
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/resources.h
 @@ -0,0 +1,11 @@
@@ -1711,7 +1711,7 @@ index 000000000000..cf9807b0dbe6
 +#endif /* _IPTS_RESOURCES_H_ */
 diff --git a/drivers/input/touchscreen/ipts/singletouch.c b/drivers/input/touchscreen/ipts/singletouch.c
 new file mode 100644
-index 000000000000..ed70444f649c
+index 0000000000000..ed70444f649c4
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/singletouch.c
 @@ -0,0 +1,64 @@
@@ -1781,7 +1781,7 @@ index 000000000000..ed70444f649c
 +}
 diff --git a/drivers/input/touchscreen/ipts/singletouch.h b/drivers/input/touchscreen/ipts/singletouch.h
 new file mode 100644
-index 000000000000..53207497a462
+index 0000000000000..53207497a4628
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/singletouch.h
 @@ -0,0 +1,14 @@
@@ -1801,7 +1801,7 @@ index 000000000000..53207497a462
 +#endif /* _IPTS_SINGLETOUCH_H_ */
 diff --git a/drivers/input/touchscreen/ipts/stylus.c b/drivers/input/touchscreen/ipts/stylus.c
 new file mode 100644
-index 000000000000..987fa756fec3
+index 0000000000000..987fa756fec33
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/stylus.c
 @@ -0,0 +1,179 @@
@@ -1986,7 +1986,7 @@ index 000000000000..987fa756fec3
 +}
 diff --git a/drivers/input/touchscreen/ipts/stylus.h b/drivers/input/touchscreen/ipts/stylus.h
 new file mode 100644
-index 000000000000..5b93add1eac2
+index 0000000000000..5b93add1eac2d
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/stylus.h
 @@ -0,0 +1,14 @@
@@ -2005,7 +2005,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 9392934e3a06..90e7d3020fa5 100644
+index 7becfc768bbcc..3d0f9bfb7c494 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -59,6 +59,7 @@
@@ -2025,7 +2025,7 @@ index 9392934e3a06..90e7d3020fa5 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 a1ed375fed37..5e621e90d8d4 100644
+index 81e759674c1b5..4f7ba1cdb3c84 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -68,6 +68,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@@ -2033,9 +2033,9 @@ index a1ed375fed37..5e621e90d8d4 100644
  	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT, MEI_ME_PCH8_CFG)},
  	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, MEI_ME_PCH8_CFG)},
 +	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_4, MEI_ME_PCH8_CFG)},
- 	{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_SPS_CFG)},
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_4_CFG)},
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_4_CFG)},
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_SPS_4_CFG)},
 @@ -94,6 +95,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
  	{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_H_3, MEI_ME_PCH8_CFG)},
  
@@ -2043,9 +2043,9 @@ index a1ed375fed37..5e621e90d8d4 100644
 +	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP_4, MEI_ME_PCH12_CFG)},
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
- 
+ 	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)},
 diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
-index 9a61c28ed3ae..47fc20975245 100644
+index 9a61c28ed3ae4..47fc20975245d 100644
 --- a/include/uapi/linux/input.h
 +++ b/include/uapi/linux/input.h
 @@ -271,6 +271,7 @@ struct input_mask {
@@ -2057,5 +2057,5 @@ index 9a61c28ed3ae..47fc20975245 100644
  /*
   * MT_TOOL types
 -- 
-2.26.2
+2.27.0
 

pkg/arch/kernel/0004-wifi.patch

@@ -0,0 +1 @@
+../../../patches/5.7/0004-wifi.patch

pkg/arch/kernel/0005-ipts.patch

@@ -0,0 +1 @@
+../../../patches/5.7/0005-ipts.patch

pkg/arch/kernel/0005-wifi.patch

@@ -1 +0,0 @@
-../../../patches/5.7/0005-wifi.patch

pkg/arch/kernel/0006-ipts.patch

@@ -1 +0,0 @@
-../../../patches/5.7/0006-ipts.patch

pkg/arch/kernel/PKGBUILD

@@ -27,8 +27,8 @@ source=(
   0001-surface3-spi.patch
   0002-surface3-oemb.patch
   0003-surface-sam.patch
-  0005-wifi.patch
-  0006-ipts.patch
+  0004-wifi.patch
+  0005-ipts.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -39,11 +39,11 @@ sha256sums=('d299e6f72f464ea0a5b128f4be90ed6267a846df1f9eb50a0fbb20c5c5ad9485'
             '623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e'
             '4662d1c8c5557e7531cfd4175809e832aa2d96771454f9631f5c09c2c40eb881'
             '8dbaa21d2c03621b0c5d96c4fbcc7a839bea5a34a5f2279a409c3b404756e753'
-            '645897cd692128a4338cc86555e8f957cffbf84bab9b9081815d5eda5d610a7f'
-            'e0a3036827179ef8eb38cc0a3f1e6bcaf6967982c0a95d22580d8b436da68b68'
-            '2f87e1711201c9b238aa76c461a54922e3b2184b3ed8acec1c10b10842ebb055'
-            'c97918839115231aa23191d5e8da72e15d999d657c341a5c452b36ab55dc40d1'
-            '3f8d02b2ed5691db073f5b096ea5095e1caef5271216523b5caf0c2445d0257c')
+            'f1f7deca92bf6ab57d693ad047f271aba00d2c0f056e56b7df51c91fa340acc6'
+            '3c32eccd72f3e5ddc0b1de386e2929a846d24a818da6739ce8916989909d6d65'
+            'f3d502fde520b12b7423e0ddca34664c207065f71371f51f5b908bd8067f48dd'
+            '7ca5048425342be76f10cfff3ad4eae96ac51236d1052e80f77e58246258699f'
+            'f46fea286e2e526d023b9082e11c36bbe2610cc6b8aeb90f8170a95d8f2ed77b')
 
 
 export KBUILD_BUILD_HOST=archlinux