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

Update the patches for 5.8

Browse source 
For 5.8, we are going to make iptsd the default, which mostly supports
4.19 level multitouch, instead of just singletouch + stylus.

This replaces the old ipts driver with the new UAPI version that is
required for iptsd.

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
This commit is contained in:
Dorian Stoll 2020-08-06 11:30:47 +02:00
parent 81934a12e1
commit 2c51b4e4ff
No known key found for this signature in database
GPG key ID: F1DACD02C619442A
6 changed files with 805 additions and 1453 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configs/surface-5.8.config
View file

@ -20,7 +20,10 @@ CONFIG_SURFACE_SAM_SID_POWER=m
#
# IPTS touchscreen
#
CONFIG_TOUCHSCREEN_IPTS=m
# This only enables the user interface for IPTS data.
# For the touchscreen to work, you need to install iptsd.
#
CONFIG_MISC_IPTS=m
#
# Other Drivers

8
patches/5.8/0001-surface3-oemb.patch
View file

@ -10,7 +10,7 @@ Subject: [PATCH 1/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 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 e2e1d5b03b381..5ff38592ba6db 100644
index e2e1d5b03b38..5ff38592ba6d 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3687,6 +3687,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
@ -48,7 +48,7 @@ index e2e1d5b03b381..5ff38592ba6db 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 2752dc9557334..ef36a316e2ed6 100644
index 2752dc955733..ef36a316e2ed 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 2752dc9557334..ef36a316e2ed6 100644
};
--
2.28.0
2.26.2

42
patches/5.8/0002-surface-sam.patch
View file

@ -45,7 +45,7 @@ Subject: [PATCH 2/5] surface-sam
create mode 100644 drivers/platform/x86/surface_sam/surface_sam_vhf.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0581a54cf562f..998007444059b 100644
index 0581a54cf562..998007444059 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1376,6 +1376,8 @@ config INTEL_SCU_PLATFORM
@ -58,7 +58,7 @@ index 0581a54cf562f..998007444059b 100644
tristate "Intel SCU IPC utility driver"
depends on INTEL_SCU
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2b85852a1a872..e154e679db453 100644
index 2b85852a1a87..e154e679db45 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -148,3 +148,4 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
@ -68,7 +68,7 @@ index 2b85852a1a872..e154e679db453 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..b5bb55248a5d5
index 000000000000..b5bb55248a5d
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/Kconfig
@@ -0,0 +1,176 @@
@ -250,7 +250,7 @@ index 0000000000000..b5bb55248a5d5
+ 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..89bced46ebcdd
index 000000000000..89bced46ebcd
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/Makefile
@@ -0,0 +1,16 @@
@ -272,7 +272,7 @@ index 0000000000000..89bced46ebcdd
+obj-$(CONFIG_SURFACE_SAM_DEBUGFS) += surface_sam_debugfs.o
diff --git a/drivers/platform/x86/surface_sam/surface_sam_debugfs.c b/drivers/platform/x86/surface_sam/surface_sam_debugfs.c
new file mode 100644
index 0000000000000..13e93404775c5
index 000000000000..13e93404775c
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_debugfs.c
@@ -0,0 +1,270 @@
@ -548,7 +548,7 @@ index 0000000000000..13e93404775c5
+MODULE_LICENSE("GPL");
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..9c844bb0f7739
index 000000000000..9c844bb0f773
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_dtx.c
@@ -0,0 +1,582 @@
@ -1136,7 +1136,7 @@ index 0000000000000..9c844bb0f7739
+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..b11f9fa8095fb
index 000000000000..b11f9fa8095f
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_hps.c
@@ -0,0 +1,1287 @@
@ -2429,7 +2429,7 @@ index 0000000000000..b11f9fa8095fb
+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..eab4e178a8450
index 000000000000..eab4e178a845
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_san.c
@@ -0,0 +1,930 @@
@ -3365,7 +3365,7 @@ index 0000000000000..eab4e178a8450
+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..3408dde964b3c
index 000000000000..3408dde964b3
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_san.h
@@ -0,0 +1,30 @@
@ -3401,7 +3401,7 @@ index 0000000000000..3408dde964b3c
+#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..bcf9a569ee719
index 000000000000..bcf9a569ee71
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_sid.c
@@ -0,0 +1,283 @@
@ -3690,7 +3690,7 @@ index 0000000000000..bcf9a569ee719
+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 @@
@ -3928,7 +3928,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..e0b1e42c2087f
index 000000000000..e0b1e42c2087
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_sid_perfmode.c
@@ -0,0 +1,214 @@
@ -4148,7 +4148,7 @@ index 0000000000000..e0b1e42c2087f
+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..64a3d46a128cc
index 000000000000..64a3d46a128c
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_sid_power.c
@@ -0,0 +1,1054 @@
@ -5208,7 +5208,7 @@ index 0000000000000..64a3d46a128cc
+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..d8d9509b7d122
index 000000000000..d8d9509b7d12
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_sid_power.h
@@ -0,0 +1,16 @@
@ -5230,7 +5230,7 @@ index 0000000000000..d8d9509b7d122
+#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..a6059d6796619
index 000000000000..a6059d679661
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.c
@@ -0,0 +1,429 @@
@ -5665,7 +5665,7 @@ index 0000000000000..a6059d6796619
+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..d956de5cf877a
index 000000000000..d956de5cf877
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_sid_vhf.h
@@ -0,0 +1,14 @@
@ -5685,7 +5685,7 @@ index 0000000000000..d956de5cf877a
+#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..4551b75570f22
index 000000000000..4551b75570f2
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_ssh.c
@@ -0,0 +1,5329 @@
@ -11020,7 +11020,7 @@ index 0000000000000..4551b75570f22
+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..ba57adb2a3c9d
index 000000000000..ba57adb2a3c9
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_ssh.h
@@ -0,0 +1,717 @@
@ -11743,7 +11743,7 @@ index 0000000000000..ba57adb2a3c9d
+#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..8ea9a2fc99d7e
index 000000000000..8ea9a2fc99d7
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_ssh_trace.h
@@ -0,0 +1,587 @@
@ -12336,7 +12336,7 @@ index 0000000000000..8ea9a2fc99d7e
+#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..8455f952c2724
index 000000000000..8455f952c272
--- /dev/null
+++ b/drivers/platform/x86/surface_sam/surface_sam_vhf.c
@@ -0,0 +1,266 @@
@ -12607,5 +12607,5 @@ index 0000000000000..8455f952c2724
+MODULE_DESCRIPTION("Virtual HID Framework Driver for 5th Generation Surface Devices");
+MODULE_LICENSE("GPL");
--
2.28.0
2.26.2

4
patches/5.8/0003-surface-sam-over-hid.patch
View file

@ -8,7 +8,7 @@ Subject: [PATCH 3/5] surface-sam-over-hid
1 file changed, 35 insertions(+)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 2ade99b105b91..60b9cb51d5f7e 100644
index 2ade99b105b9..60b9cb51d5f7 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -574,6 +574,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
@ -61,5 +61,5 @@ index 2ade99b105b91..60b9cb51d5f7e 100644
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
accessor_type, client->addr);
--
2.28.0
2.26.2

8
patches/5.8/0004-wifi.patch
View file

@ -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 4e4f59c17ded3..528eedfbf41c9 100644
index 4e4f59c17ded..528eedfbf41c 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 4e4f59c17ded3..528eedfbf41c9 100644
}
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 87b4ccca4b9a2..3bdad5e80ecbb 100644
index 87b4ccca4b9a..3bdad5e80ecb 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 87b4ccca4b9a2..3bdad5e80ecbb 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 8bd355d7974e9..256c8c38deee3 100644
index 8bd355d7974e..256c8c38deee 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2247,7 +2247,6 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
@ -251,5 +251,5 @@ index 8bd355d7974e9..256c8c38deee3 100644
if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
/* Send cmd to FW to enable/disable 11D function */
--
2.28.0
2.26.2

2191
patches/5.8/0005-ipts.patch
View file

File diff suppressed because it is too large Load diff