Skip to content

Commit 125ac40

Browse files
kernel: Patch linux-t2-patches to fix context
1 parent 79ecdfa commit 125ac40

2 files changed

Lines changed: 43 additions & 0 deletions

File tree

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
--- a/4001-asahi-trackpad.patch
2+
+++ b/4001-asahi-trackpad.patch
3+
@@ -937,21 +937,21 @@
4+
--- a/drivers/hid/Kconfig
5+
+++ b/drivers/hid/Kconfig
6+
@@ -1388,4 +1388,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
7+
8+
- source "drivers/hid/surface-hid/Kconfig"
9+
+ source "drivers/hid/intel-thc-hid/Kconfig"
10+
11+
+source "drivers/hid/spi-hid/Kconfig"
12+
+
13+
endif # HID_SUPPORT
14+
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
15+
index 24de45f36..f4b2e84c7 100644
16+
--- a/drivers/hid/Makefile
17+
+++ b/drivers/hid/Makefile
18+
-@@ -171,3 +171,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/
19+
- obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
20+
-
21+
+@@ -175,3 +175,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/
22+
obj-$(CONFIG_SURFACE_HID_CORE) += surface-hid/
23+
+
24+
+ obj-$(CONFIG_INTEL_THC_HID) += intel-thc-hid/
25+
+
26+
+obj-$(CONFIG_SPI_HID_APPLE_CORE) += spi-hid/
27+
diff --git a/drivers/hid/spi-hid/Kconfig b/drivers/hid/spi-hid/Kconfig
28+
new file mode 100644
29+
@@ -3064,10 +3064,10 @@
30+
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
31+
index f4b2e84c7..a5026febe 100644
32+
--- a/drivers/hid/Makefile
33+
+++ b/drivers/hid/Makefile
34+
-@@ -173,3 +173,5 @@ obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
35+
- obj-$(CONFIG_SURFACE_HID_CORE) += surface-hid/
36+
+@@ -175,3 +175,5 @@ obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
37+
+ obj-$(CONFIG_INTEL_THC_HID) += intel-thc-hid/
38+
39+
obj-$(CONFIG_SPI_HID_APPLE_CORE) += spi-hid/
40+
+
41+
+obj-$(CONFIG_HID_DOCKCHANNEL) += dockchannel-hid/
42+

kernel/kernel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ apply_kconfig 'CONFIG_CMDLINE="intel_iommu=on iommu=pt mem_sleep=s2idle pcie_por
4040
apply_kconfig 'CONFIG_CMDLINE_BOOL=y'
4141
echo "# CONFIG_CMDLINE_OVERRIDE is not set" >> kernel-x86_64-fedora.config
4242

43+
git apply --directory="linux-t2-patches" "./fix-context-4001-asahi-trackpad.patch"
4344
cat "linux-t2-patches"/*.patch > "t2linux-combined.patch"

0 commit comments

Comments
 (0)