Update v5.4 patches; drop surface3-spi

Changes:
  surface3-spi:
    - Dropped this patch in favor of the upstream DMA fix. For details,
      take a look at the commit history of kernel repo linked below.

Links:
- kernel: https://github.com/linux-surface/kernel/commits/f455d2737885cd256c16162c8367eb009278257a

Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>

patches/5.4/0001-surface3-power.patch

@@ -1,7 +1,7 @@
-From 9d4db1c11d731093c64074c79811b0cb38212f15 Mon Sep 17 00:00:00 2001
+From b7d0622c7e15d3caeede840e33efed1c7dbbfaa4 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/6] surface3-power
+Subject: [PATCH 1/5] surface3-power
 
 ---
  drivers/platform/x86/Kconfig          |   7 +
@@ -11,7 +11,7 @@ Subject: [PATCH 1/6] surface3-power
  create mode 100644 drivers/platform/x86/surface3_power.c
 
 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
-index 1cab993205142..348c795019fa4 100644
+index 1cab99320514..348c795019fa 100644
 --- a/drivers/platform/x86/Kconfig
 +++ b/drivers/platform/x86/Kconfig
 @@ -1209,6 +1209,13 @@ config SURFACE_3_BUTTON
@@ -29,7 +29,7 @@ index 1cab993205142..348c795019fa4 100644
  	tristate "Intel P-Unit IPC Driver"
  	---help---
 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
-index 4151040330601..6dd955ad9bf18 100644
+index 415104033060..6dd955ad9bf1 100644
 --- a/drivers/platform/x86/Makefile
 +++ b/drivers/platform/x86/Makefile
 @@ -85,6 +85,7 @@ obj-$(CONFIG_INTEL_PMC_IPC)	+= intel_pmc_ipc.o
@@ -42,7 +42,7 @@ index 4151040330601..6dd955ad9bf18 100644
  obj-$(CONFIG_INTEL_TELEMETRY)	+= intel_telemetry_core.o \
 diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/x86/surface3_power.c
 new file mode 100644
-index 0000000000000..e0af01a603025
+index 000000000000..e0af01a60302
 --- /dev/null
 +++ b/drivers/platform/x86/surface3_power.c
 @@ -0,0 +1,604 @@

patches/5.4/0003-surface3-oemb.patch → patches/5.4/0002-surface3-oemb.patch

@@ -1,7 +1,7 @@
-From c62f29513192efd717ded5141bc0ac8df6abacad Mon Sep 17 00:00:00 2001
+From f31a2997266f71cfe81a3cc9b1f27042ff0e76d8 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/6] surface3-oemb
+Subject: [PATCH 2/5] surface3-oemb
 
 ---
  drivers/platform/x86/surface3-wmi.c               | 7 +++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 3/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 130b6f52a6001..801083aa56d6d 100644
+index 130b6f52a600..801083aa56d6 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,7 +28,7 @@ index 130b6f52a6001..801083aa56d6d 100644
  	{ }
  };
 diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
-index c83f7f5da96b7..e6bfe684d6be8 100644
+index c83f7f5da96b..e6bfe684d6be 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[] = {
@@ -48,7 +48,7 @@ index c83f7f5da96b7..e6bfe684d6be8 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 d0fb43c2b9f68..0e938713cb133 100644
+index d0fb43c2b9f6..0e938713cb13 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[] = {

patches/5.4/0002-surface3-spi.patch

@@ -1,63 +0,0 @@
-From 899999f08d963bfac665cbad34434ec52c15b6aa 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/6] 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 ce4828b1415a8..63b0b8ddf0903 100644
---- a/drivers/input/touchscreen/surface3_spi.c
-+++ b/drivers/input/touchscreen/surface3_spi.c
-@@ -25,6 +25,12 @@
- #define SURFACE3_REPORT_TOUCH	0xd2
- #define SURFACE3_REPORT_PEN	0x16
- 
-+bool use_dma = false;
-+module_param(use_dma, bool, 0644);
-+MODULE_PARM_DESC(use_dma,
-+				"Disable DMA mode if you encounter touch input crash. "
-+				"(default: false, disabled to avoid crash)");
-+
- struct surface3_ts_data {
- 	struct spi_device *spi;
- 	struct gpio_desc *gpiod_rst[2];
-@@ -326,6 +332,13 @@ static int surface3_spi_create_pen_input(struct surface3_ts_data *data)
- 	return 0;
- }
- 
-+static bool surface3_spi_can_dma(struct spi_controller *ctlr,
-+				struct spi_device *spi,
-+				struct spi_transfer *tfr)
-+{
-+	return use_dma;
-+}
-+
- static int surface3_spi_probe(struct spi_device *spi)
- {
- 	struct surface3_ts_data *data;
-@@ -368,6 +381,19 @@ static int surface3_spi_probe(struct spi_device *spi)
- 	if (error)
- 		return error;
- 
-+	/*
-+	 * Set up DMA
-+	 *
-+	 * TODO: Currently, touch input with DMA seems to be broken.
-+	 * On 4.19 LTS, touch input will crash after suspend.
-+	 * On recent stable kernel (at least after 5.1), touch input will crash after
-+	 * the first touch. No problem with PIO on those kernels.
-+	 * Maybe we need to configure DMA here.
-+	 *
-+	 * Link to issue: https://github.com/jakeday/linux-surface/issues/596
-+	 */
-+	spi->controller->can_dma = surface3_spi_can_dma;
-+
- 	return 0;
- }
- 
--- 
-2.27.0
-

patches/5.4/0004-surface-sam.patch → patches/5.4/0003-surface-sam.patch

@@ -1,7 +1,7 @@
-From 9fe067a9be3ad6e688acd4f4e1452a6c876e4401 Mon Sep 17 00:00:00 2001
+From 0d17ea2d04af09c1689b6c892fc67b635b588423 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/6] surface-sam
+Subject: [PATCH 3/5] surface-sam
 
 ---
  drivers/acpi/acpica/dsopcode.c                |    2 +-
@@ -46,7 +46,7 @@ Subject: [PATCH 4/6] surface-sam
  create mode 100644 drivers/platform/x86/surface_sam/surface_sam_vhf.c
 
 diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
-index 10f32b62608ee..7b2a4987f0507 100644
+index 10f32b62608e..7b2a4987f050 100644
 --- a/drivers/acpi/acpica/dsopcode.c
 +++ b/drivers/acpi/acpica/dsopcode.c
 @@ -123,7 +123,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
@@ -59,7 +59,7 @@ index 10f32b62608ee..7b2a4987f0507 100644
  		bit_count = (u32) length_desc->integer.value;
  
 diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
-index d3d2dbfba680c..0b7f617a6e9b1 100644
+index d3d2dbfba680..0b7f617a6e9b 100644
 --- a/drivers/acpi/acpica/exfield.c
 +++ b/drivers/acpi/acpica/exfield.c
 @@ -109,6 +109,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
@@ -91,7 +91,7 @@ index d3d2dbfba680c..0b7f617a6e9b1 100644
  		buffer_desc = acpi_ut_create_buffer_object(buffer_length);
  		if (!buffer_desc) {
 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
-index 348c795019fa4..d25067a838a33 100644
+index 348c795019fa..d25067a838a3 100644
 --- a/drivers/platform/x86/Kconfig
 +++ b/drivers/platform/x86/Kconfig
 @@ -1342,6 +1342,7 @@ config PCENGINES_APU2
@@ -103,7 +103,7 @@ index 348c795019fa4..d25067a838a33 100644
  endif # X86_PLATFORM_DEVICES
  
 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
-index 6dd955ad9bf18..19b56f2181eb9 100644
+index 6dd955ad9bf1..19b56f2181eb 100644
 --- a/drivers/platform/x86/Makefile
 +++ b/drivers/platform/x86/Makefile
 @@ -101,3 +101,4 @@ obj-$(CONFIG_I2C_MULTI_INSTANTIATE)	+= i2c-multi-instantiate.o
@@ -113,7 +113,7 @@ index 6dd955ad9bf18..19b56f2181eb9 100644
 +obj-$(CONFIG_SURFACE_SAM)	+= surface_sam/
 diff --git a/drivers/platform/x86/surface_sam/Kconfig b/drivers/platform/x86/surface_sam/Kconfig
 new file mode 100644
-index 0000000000000..7781c5cd932c0
+index 000000000000..7781c5cd932c
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/Kconfig
 @@ -0,0 +1,176 @@
@@ -295,7 +295,7 @@ index 0000000000000..7781c5cd932c0
 +	  If you are not sure, say M here.
 diff --git a/drivers/platform/x86/surface_sam/Makefile b/drivers/platform/x86/surface_sam/Makefile
 new file mode 100644
-index 0000000000000..1a5c1260639dc
+index 000000000000..1a5c1260639d
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/Makefile
 @@ -0,0 +1,15 @@
@@ -316,7 +316,7 @@ index 0000000000000..1a5c1260639dc
 +obj-$(CONFIG_SURFACE_SAM_SID_VHF)	+= surface_sam_sid_vhf.o
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_dtx.c b/drivers/platform/x86/surface_sam/surface_sam_dtx.c
 new file mode 100644
-index 0000000000000..88dba7bced3a4
+index 000000000000..88dba7bced3a
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_dtx.c
 @@ -0,0 +1,590 @@
@@ -912,7 +912,7 @@ index 0000000000000..88dba7bced3a4
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_hps.c b/drivers/platform/x86/surface_sam/surface_sam_hps.c
 new file mode 100644
-index 0000000000000..40f39f29113c5
+index 000000000000..40f39f29113c
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_hps.c
 @@ -0,0 +1,1297 @@
@@ -2215,7 +2215,7 @@ index 0000000000000..40f39f29113c5
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_san.c b/drivers/platform/x86/surface_sam/surface_sam_san.c
 new file mode 100644
-index 0000000000000..11dd6daedc3dd
+index 000000000000..11dd6daedc3d
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_san.c
 @@ -0,0 +1,913 @@
@@ -3134,7 +3134,7 @@ index 0000000000000..11dd6daedc3dd
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_san.h b/drivers/platform/x86/surface_sam/surface_sam_san.h
 new file mode 100644
-index 0000000000000..2b9dee159bbbc
+index 000000000000..2b9dee159bbb
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_san.h
 @@ -0,0 +1,30 @@
@@ -3170,7 +3170,7 @@ index 0000000000000..2b9dee159bbbc
 +#endif /* _SURFACE_SAM_SAN_H */
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid.c b/drivers/platform/x86/surface_sam/surface_sam_sid.c
 new file mode 100644
-index 0000000000000..caa2e6446b5f4
+index 000000000000..caa2e6446b5f
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid.c
 @@ -0,0 +1,281 @@
@@ -3457,7 +3457,7 @@ index 0000000000000..caa2e6446b5f4
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid_gpelid.c b/drivers/platform/x86/surface_sam/surface_sam_sid_gpelid.c
 new file mode 100644
-index 0000000000000..f0cee43c859b4
+index 000000000000..f0cee43c859b
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid_gpelid.c
 @@ -0,0 +1,232 @@
@@ -3695,7 +3695,7 @@ index 0000000000000..f0cee43c859b4
 +MODULE_ALIAS("platform:surface_sam_sid_gpelid");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid_perfmode.c b/drivers/platform/x86/surface_sam/surface_sam_sid_perfmode.c
 new file mode 100644
-index 0000000000000..2e11efb166f2b
+index 000000000000..2e11efb166f2
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid_perfmode.c
 @@ -0,0 +1,216 @@
@@ -3917,7 +3917,7 @@ index 0000000000000..2e11efb166f2b
 +MODULE_ALIAS("platform:surface_sam_sid_perfmode");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid_power.c b/drivers/platform/x86/surface_sam/surface_sam_sid_power.c
 new file mode 100644
-index 0000000000000..1d945c0a911a4
+index 000000000000..1d945c0a911a
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid_power.c
 @@ -0,0 +1,1154 @@
@@ -5077,7 +5077,7 @@ index 0000000000000..1d945c0a911a4
 +MODULE_ALIAS("platform:surface_sam_sid_battery");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid_power.h b/drivers/platform/x86/surface_sam/surface_sam_sid_power.h
 new file mode 100644
-index 0000000000000..2e8f212086e12
+index 000000000000..2e8f212086e1
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid_power.h
 @@ -0,0 +1,15 @@
@@ -5098,7 +5098,7 @@ index 0000000000000..2e8f212086e12
 +#endif /* _SURFACE_SAM_SID_POWER_H */
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.c b/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.c
 new file mode 100644
-index 0000000000000..474221097eaf1
+index 000000000000..474221097eaf
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.c
 @@ -0,0 +1,432 @@
@@ -5536,7 +5536,7 @@ index 0000000000000..474221097eaf1
 +MODULE_ALIAS("platform:surface_sam_sid_vhf");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.h b/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.h
 new file mode 100644
-index 0000000000000..eb55485ccb119
+index 000000000000..eb55485ccb11
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.h
 @@ -0,0 +1,13 @@
@@ -5555,7 +5555,7 @@ index 0000000000000..eb55485ccb119
 +#endif /* _SURFACE_SAM_SID_VHF_H */
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_ssh.c b/drivers/platform/x86/surface_sam/surface_sam_ssh.c
 new file mode 100644
-index 0000000000000..9f44bdfbc4fd7
+index 000000000000..9f44bdfbc4fd
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_ssh.c
 @@ -0,0 +1,5111 @@
@@ -10672,7 +10672,7 @@ index 0000000000000..9f44bdfbc4fd7
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_ssh.h b/drivers/platform/x86/surface_sam/surface_sam_ssh.h
 new file mode 100644
-index 0000000000000..25a3ae85fee7f
+index 000000000000..25a3ae85fee7
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_ssh.h
 @@ -0,0 +1,488 @@
@@ -11166,7 +11166,7 @@ index 0000000000000..25a3ae85fee7f
 +#endif /* _SURFACE_SAM_SSH_H */
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_ssh_trace.h b/drivers/platform/x86/surface_sam/surface_sam_ssh_trace.h
 new file mode 100644
-index 0000000000000..801c60205128c
+index 000000000000..801c60205128
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_ssh_trace.h
 @@ -0,0 +1,536 @@
@@ -11708,7 +11708,7 @@ index 0000000000000..801c60205128c
 +#include <trace/define_trace.h>
 diff --git a/drivers/platform/x86/surface_sam/surface_sam_vhf.c b/drivers/platform/x86/surface_sam/surface_sam_vhf.c
 new file mode 100644
-index 0000000000000..984035c55d63a
+index 000000000000..984035c55d63
 --- /dev/null
 +++ b/drivers/platform/x86/surface_sam/surface_sam_vhf.c
 @@ -0,0 +1,261 @@
@@ -11974,7 +11974,7 @@ index 0000000000000..984035c55d63a
 +MODULE_DESCRIPTION("Virtual HID Framework Driver for 5th Generation Surface Devices");
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
-index a9719858c950b..ce5309d002805 100644
+index a9719858c950..ce5309d00280 100644
 --- a/drivers/tty/serdev/core.c
 +++ b/drivers/tty/serdev/core.c
 @@ -552,16 +552,97 @@ static int of_serdev_register_devices(struct serdev_controller *ctrl)

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

@@ -1,7 +1,7 @@
-From 21d75f9e70de41d4471dfe5d979120fb127e3519 Mon Sep 17 00:00:00 2001
+From 81f59a0eb1eb61ad4fca8352c414985c1f334115 Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Thu, 20 Feb 2020 16:51:11 +0900
-Subject: [PATCH 5/6] wifi
+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 9e6dc289ec3e8..00b4bc4469892 100644
+index 9e6dc289ec3e..00b4bc446989 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 9e6dc289ec3e8..00b4bc4469892 100644
  }
  
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
-index fc1706d0647d7..b51c5e3571426 100644
+index fc1706d0647d..b51c5e357142 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 fc1706d0647d7..b51c5e3571426 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 4ed10cf82f9a4..410bef3d6a6eb 100644
+index 4ed10cf82f9a..410bef3d6a6e 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,

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

@@ -1,7 +1,7 @@
-From 2b11f864bf10eb5567ce741dcddfd2460a7cf89d Mon Sep 17 00:00:00 2001
+From e7b66a10da721768f9472502bedd9583685e2e5e 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 46ad9090493bb..c476a153b2f80 100644
+index 46ad9090493b..c476a153b2f8 100644
 --- a/drivers/input/touchscreen/Kconfig
 +++ b/drivers/input/touchscreen/Kconfig
 @@ -1314,4 +1314,6 @@ config TOUCHSCREEN_IQS5XX
@@ -87,7 +87,7 @@ index 46ad9090493bb..c476a153b2f80 100644
 +
  endif
 diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
-index 94c6162409b37..864f0e092ab67 100644
+index 94c6162409b3..864f0e092ab6 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 94c6162409b37..864f0e092ab67 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 0000000000000..d3c530dafa948
+index 000000000000..d3c530dafa94
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/Kconfig
 @@ -0,0 +1,16 @@
@@ -122,7 +122,7 @@ index 0000000000000..d3c530dafa948
 +	  module will be called ipts.
 diff --git a/drivers/input/touchscreen/ipts/Makefile b/drivers/input/touchscreen/ipts/Makefile
 new file mode 100644
-index 0000000000000..0f7c904e73171
+index 000000000000..0f7c904e7317
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/Makefile
 @@ -0,0 +1,17 @@
@@ -145,7 +145,7 @@ index 0000000000000..0f7c904e73171
 +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 0000000000000..ab26552579a5c
+index 000000000000..ab26552579a5
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/context.h
 @@ -0,0 +1,60 @@
@@ -211,7 +211,7 @@ index 0000000000000..ab26552579a5c
 +#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 0000000000000..9179eca665585
+index 000000000000..9179eca66558
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/control.c
 @@ -0,0 +1,94 @@
@@ -311,7 +311,7 @@ index 0000000000000..9179eca665585
 +}
 diff --git a/drivers/input/touchscreen/ipts/control.h b/drivers/input/touchscreen/ipts/control.h
 new file mode 100644
-index 0000000000000..e57609c85d62a
+index 000000000000..e57609c85d62
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/control.h
 @@ -0,0 +1,18 @@
@@ -335,7 +335,7 @@ index 0000000000000..e57609c85d62a
 +#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 0000000000000..568bf04f7ea6e
+index 000000000000..568bf04f7ea6
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/data.c
 @@ -0,0 +1,107 @@
@@ -448,7 +448,7 @@ index 0000000000000..568bf04f7ea6e
 +}
 diff --git a/drivers/input/touchscreen/ipts/data.h b/drivers/input/touchscreen/ipts/data.h
 new file mode 100644
-index 0000000000000..fa72c1be09451
+index 000000000000..fa72c1be0945
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/data.h
 @@ -0,0 +1,12 @@
@@ -466,7 +466,7 @@ index 0000000000000..fa72c1be09451
 +#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 0000000000000..2642990b8c420
+index 000000000000..2642990b8c42
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/hid.c
 @@ -0,0 +1,38 @@
@@ -510,7 +510,7 @@ index 0000000000000..2642990b8c420
 +}
 diff --git a/drivers/input/touchscreen/ipts/hid.h b/drivers/input/touchscreen/ipts/hid.h
 new file mode 100644
-index 0000000000000..e6cf38fce4541
+index 000000000000..e6cf38fce454
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/hid.h
 @@ -0,0 +1,13 @@
@@ -529,7 +529,7 @@ index 0000000000000..e6cf38fce4541
 +#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 0000000000000..fb70d55542af7
+index 000000000000..fb70d55542af
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/init.c
 @@ -0,0 +1,93 @@
@@ -628,7 +628,7 @@ index 0000000000000..fb70d55542af7
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/input/touchscreen/ipts/math.c b/drivers/input/touchscreen/ipts/math.c
 new file mode 100644
-index 0000000000000..df956e5447e03
+index 000000000000..df956e5447e0
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/math.c
 @@ -0,0 +1,103 @@
@@ -737,7 +737,7 @@ index 0000000000000..df956e5447e03
 +}
 diff --git a/drivers/input/touchscreen/ipts/math.h b/drivers/input/touchscreen/ipts/math.h
 new file mode 100644
-index 0000000000000..8e831074ab60b
+index 000000000000..8e831074ab60
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/math.h
 @@ -0,0 +1,21 @@
@@ -764,7 +764,7 @@ index 0000000000000..8e831074ab60b
 +#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 0000000000000..6aa3f5cf1d762
+index 000000000000..6aa3f5cf1d76
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/params.c
 @@ -0,0 +1,27 @@
@@ -797,7 +797,7 @@ index 0000000000000..6aa3f5cf1d762
 +);
 diff --git a/drivers/input/touchscreen/ipts/params.h b/drivers/input/touchscreen/ipts/params.h
 new file mode 100644
-index 0000000000000..1f992a3bc21b9
+index 000000000000..1f992a3bc21b
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/params.h
 @@ -0,0 +1,15 @@
@@ -818,7 +818,7 @@ index 0000000000000..1f992a3bc21b9
 +#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 0000000000000..3572ddc0f2fb0
+index 000000000000..3572ddc0f2fb
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/payload.c
 @@ -0,0 +1,52 @@
@@ -876,7 +876,7 @@ index 0000000000000..3572ddc0f2fb0
 +}
 diff --git a/drivers/input/touchscreen/ipts/payload.h b/drivers/input/touchscreen/ipts/payload.h
 new file mode 100644
-index 0000000000000..6603714bb6fd0
+index 000000000000..6603714bb6fd
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/payload.h
 @@ -0,0 +1,14 @@
@@ -896,7 +896,7 @@ index 0000000000000..6603714bb6fd0
 +#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 0000000000000..2533dfb13584a
+index 000000000000..2533dfb13584
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/commands.h
 @@ -0,0 +1,61 @@
@@ -963,7 +963,7 @@ index 0000000000000..2533dfb13584a
 +#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 0000000000000..148e0545b2e4e
+index 000000000000..148e0545b2e4
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/data.h
 @@ -0,0 +1,30 @@
@@ -999,7 +999,7 @@ index 0000000000000..148e0545b2e4e
 +#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 0000000000000..f8b771f90bd2b
+index 000000000000..f8b771f90bd2
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/events.h
 @@ -0,0 +1,29 @@
@@ -1034,7 +1034,7 @@ index 0000000000000..f8b771f90bd2b
 +#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 0000000000000..8b3d8b689ee83
+index 000000000000..8b3d8b689ee8
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/feedback.h
 @@ -0,0 +1,30 @@
@@ -1070,7 +1070,7 @@ index 0000000000000..8b3d8b689ee83
 +#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 0000000000000..f46da4ea81f25
+index 000000000000..f46da4ea81f2
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/payload.h
 @@ -0,0 +1,47 @@
@@ -1123,7 +1123,7 @@ index 0000000000000..f46da4ea81f25
 +#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 0000000000000..27153d82a5d67
+index 000000000000..27153d82a5d6
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/responses.h
 @@ -0,0 +1,62 @@
@@ -1191,7 +1191,7 @@ index 0000000000000..27153d82a5d67
 +#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 0000000000000..bf9912ee2af4c
+index 000000000000..bf9912ee2af4
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/singletouch.h
 @@ -0,0 +1,17 @@
@@ -1214,7 +1214,7 @@ index 0000000000000..bf9912ee2af4c
 +#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 0000000000000..950850b365dfb
+index 000000000000..950850b365df
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/protocol/stylus.h
 @@ -0,0 +1,52 @@
@@ -1272,7 +1272,7 @@ index 0000000000000..950850b365dfb
 +#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 0000000000000..ab283994c3e5f
+index 000000000000..ab283994c3e5
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/receiver.c
 @@ -0,0 +1,265 @@
@@ -1543,7 +1543,7 @@ index 0000000000000..ab283994c3e5f
 +}
 diff --git a/drivers/input/touchscreen/ipts/receiver.h b/drivers/input/touchscreen/ipts/receiver.h
 new file mode 100644
-index 0000000000000..4d413a0abd4c5
+index 000000000000..4d413a0abd4c
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/receiver.h
 @@ -0,0 +1,8 @@
@@ -1557,7 +1557,7 @@ index 0000000000000..4d413a0abd4c5
 +#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 0000000000000..704db9fdd3fd4
+index 000000000000..704db9fdd3fd
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/resources.c
 @@ -0,0 +1,131 @@
@@ -1694,7 +1694,7 @@ index 0000000000000..704db9fdd3fd4
 +}
 diff --git a/drivers/input/touchscreen/ipts/resources.h b/drivers/input/touchscreen/ipts/resources.h
 new file mode 100644
-index 0000000000000..cf9807b0dbe62
+index 000000000000..cf9807b0dbe6
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/resources.h
 @@ -0,0 +1,11 @@
@@ -1711,7 +1711,7 @@ index 0000000000000..cf9807b0dbe62
 +#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 0000000000000..ed70444f649c4
+index 000000000000..ed70444f649c
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/singletouch.c
 @@ -0,0 +1,64 @@
@@ -1781,7 +1781,7 @@ index 0000000000000..ed70444f649c4
 +}
 diff --git a/drivers/input/touchscreen/ipts/singletouch.h b/drivers/input/touchscreen/ipts/singletouch.h
 new file mode 100644
-index 0000000000000..53207497a4628
+index 000000000000..53207497a462
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/singletouch.h
 @@ -0,0 +1,14 @@
@@ -1801,7 +1801,7 @@ index 0000000000000..53207497a4628
 +#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 0000000000000..987fa756fec33
+index 000000000000..987fa756fec3
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/stylus.c
 @@ -0,0 +1,179 @@
@@ -1986,7 +1986,7 @@ index 0000000000000..987fa756fec33
 +}
 diff --git a/drivers/input/touchscreen/ipts/stylus.h b/drivers/input/touchscreen/ipts/stylus.h
 new file mode 100644
-index 0000000000000..5b93add1eac2d
+index 000000000000..5b93add1eac2
 --- /dev/null
 +++ b/drivers/input/touchscreen/ipts/stylus.h
 @@ -0,0 +1,14 @@
@@ -2005,7 +2005,7 @@ index 0000000000000..5b93add1eac2d
 +
 +#endif /* _IPTS_STYLUS_H_ */
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index e56dc47540646..a55c61c89238a 100644
+index e56dc4754064..a55c61c89238 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 e56dc47540646..a55c61c89238a 100644
  #define MEI_DEV_ID_TGP_LP     0xA0E0  /* Tiger Lake Point LP */
  
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 75ab2ffbf235f..78790904d77cb 100644
+index 75ab2ffbf235..78790904d77c 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[] = {
@@ -2045,7 +2045,7 @@ index 75ab2ffbf235f..78790904d77cb 100644
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)},
  
 diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
-index 9a61c28ed3ae4..47fc20975245d 100644
+index 9a61c28ed3ae..47fc20975245 100644
 --- a/include/uapi/linux/input.h
 +++ b/include/uapi/linux/input.h
 @@ -271,6 +271,7 @@ struct input_mask {