beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update v5.4 patches

Browse source 
Changes:
  SAM:
    - Enable performance modes on Surface Laptop 1 and 2.
    - Support for D0-exit/D0-entry notifications, sent to the SAM
      controller when suspending (D0-exit) or resuming (D0-entry) on
      newer (gen. 7+) devices.
    - Replace sysfs-based debug device with new debugfs-based debug
      device.
    - More internal restructuring and internal API changes.
    - Some small bug fixes.

  SAM-over-HID:
    - Add ACPI support for SAM-over-HID. This allows setting dGPU power
      on the Surface Book 1 via ACPI calls.

Links:
- kernel: 91f5a27a55
- SAM: 89b8232d49
This commit is contained in:
Maximilian Luz 2020-07-30 20:38:28 +02:00
parent 0ccce0b332
commit 00e270fc8a
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
7 changed files with 2466 additions and 1914 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configs/surface-5.4.config
View file

@ -4,7 +4,8 @@
CONFIG_GPIO_SYSFS=y # required for SURFACE_SAM_HPS
CONFIG_SURFACE_SAM=m
CONFIG_SURFACE_SAM_SSH=m
CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
CONFIG_SURFACE_SAM_SSH_ERROR_INJECTION=n
CONFIG_SURFACE_SAM_DEBUGFS=m
CONFIG_SURFACE_SAM_SAN=m
CONFIG_SURFACE_SAM_VHF=m
CONFIG_SURFACE_SAM_DTX=m

12
patches/5.4/0001-surface3-power.patch
View file

@ -1,7 +1,7 @@
From b7d0622c7e15d3caeede840e33efed1c7dbbfaa4 Mon Sep 17 00:00:00 2001
From 7f67d3c72b8968df814d0b94c2f2f8c6b621fbdf 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/5] surface3-power
Subject: [PATCH 1/6] surface3-power
---
drivers/platform/x86/Kconfig | 7 +
@ -11,7 +11,7 @@ Subject: [PATCH 1/5] surface3-power
create mode 100644 drivers/platform/x86/surface3_power.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1cab99320514..348c795019fa 100644
index 1cab993205142..348c795019fa4 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1209,6 +1209,13 @@ config SURFACE_3_BUTTON
@ -29,7 +29,7 @@ index 1cab99320514..348c795019fa 100644
tristate "Intel P-Unit IPC Driver"
---help---
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 415104033060..6dd955ad9bf1 100644
index 4151040330601..6dd955ad9bf18 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 415104033060..6dd955ad9bf1 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 000000000000..e0af01a60302
index 0000000000000..e0af01a603025
--- /dev/null
+++ b/drivers/platform/x86/surface3_power.c
@@ -0,0 +1,604 @@
@ -651,5 +651,5 @@ index 000000000000..e0af01a60302
+MODULE_DESCRIPTION("mshw0011 driver");
+MODULE_LICENSE("GPL v2");
--
2.27.0
2.28.0

12
patches/5.4/0002-surface3-oemb.patch
View file

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

4196
patches/5.4/0003-surface-sam.patch
View file

File diff suppressed because it is too large Load diff

65
patches/5.4/0004-surface-sam-over-hid.patch Normal file
View file

@ -0,0 +1,65 @@
From 14bc7782c703218156fe5fd6b8df97a5f25f8d3e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 25 Jul 2020 17:19:53 +0200
Subject: [PATCH 4/6] surface-sam-over-hid
---
drivers/i2c/i2c-core-acpi.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index ce70b5288472c..5df647c4d9a51 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -582,6 +582,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
return (ret == 1) ? 0 : -EIO;
}
+static int acpi_gsb_i2c_write_raw_bytes(struct i2c_client *client,
+ u8 *data, u8 data_len)
+{
+ struct i2c_msg msgs[1];
+ int ret = AE_OK;
+
+ msgs[0].addr = client->addr;
+ msgs[0].flags = client->flags;
+ msgs[0].len = data_len + 1;
+ msgs[0].buf = data;
+
+ ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+
+ if (ret < 0) {
+ dev_err(&client->adapter->dev, "i2c write failed: %d\n", ret);
+ return ret;
+ }
+
+ /* 1 transfer must have completed successfully */
+ return (ret == 1) ? 0 : -EIO;
+}
+
static acpi_status
i2c_acpi_space_handler(u32 function, acpi_physical_address command,
u32 bits, u64 *value64,
@@ -683,6 +705,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
}
break;
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
+ if (action == ACPI_READ) {
+ dev_warn(&adapter->dev,
+ "protocol 0x%02x not supported for client 0x%02x\n",
+ accessor_type, client->addr);
+ ret = AE_BAD_PARAMETER;
+ goto err;
+ } else {
+ status = acpi_gsb_i2c_write_raw_bytes(client,
+ gsb->data, info->access_length);
+ }
+ break;
+
default:
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
accessor_type, client->addr);
--
2.28.0

12
patches/5.4/0004-wifi.patch → patches/5.4/0005-wifi.patch
View file

@ -1,7 +1,7 @@
From 81f59a0eb1eb61ad4fca8352c414985c1f334115 Mon Sep 17 00:00:00 2001
From 25533d6a5d98372ae1a7e04c7fb0fd35bd4d19f6 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 4/5] wifi
Subject: [PATCH 5/6] wifi
---
.../net/wireless/marvell/mwifiex/cfg80211.c | 26 ++++++
@ -10,7 +10,7 @@ Subject: [PATCH 4/5] 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 9e6dc289ec3e..00b4bc446989 100644
index 9e6dc289ec3e8..00b4bc4469892 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 9e6dc289ec3e..00b4bc446989 100644
}
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index fc1706d0647d..b51c5e357142 100644
index fc1706d0647d7..b51c5e3571426 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 fc1706d0647d..b51c5e357142 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 4ed10cf82f9a..410bef3d6a6e 100644
index 4ed10cf82f9a4..410bef3d6a6eb 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 4ed10cf82f9a..410bef3d6a6e 100644
if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
/* Send cmd to FW to enable/disable 11D function */
--
2.27.0
2.28.0

80
patches/5.4/0005-ipts.patch → patches/5.4/0006-ipts.patch
View file

@ -1,7 +1,7 @@
From e7b66a10da721768f9472502bedd9583685e2e5e Mon Sep 17 00:00:00 2001
From 2a57236358e1eaf2bdb4f3f6a247d1a8e25afd8b 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 5/5] ipts
Subject: [PATCH 6/6] ipts
---
drivers/input/touchscreen/Kconfig | 2 +
@ -76,7 +76,7 @@ Subject: [PATCH 5/5] ipts
create mode 100644 drivers/input/touchscreen/ipts/stylus.h
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 46ad9090493b..c476a153b2f8 100644
index 46ad9090493bb..c476a153b2f80 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1314,4 +1314,6 @@ config TOUCHSCREEN_IQS5XX
@ -87,7 +87,7 @@ index 46ad9090493b..c476a153b2f8 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 e56dc4754064..a55c61c89238 100644
index e56dc47540646..a55c61c89238a 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 e56dc4754064..a55c61c89238 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 75ab2ffbf235..78790904d77c 100644
index 75ab2ffbf235f..78790904d77cb 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 75ab2ffbf235..78790904d77c 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 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.27.0
2.28.0