Sfoglia il codice sorgente

Update v5.14 patches

Changes:
  - Add support for Surface Aggregator devices on the Surface Laptop
    Studio. This includes support for battery status information,
    keyboard, touchpad, as well as other HID devices, and performance /
    platform profiles.
  - Add support for wake via lid on the Surface Laptop Studio.
Maximilian Luz 3 anni fa
parent
commit
bd0321e349

+ 104 - 0
patches/5.14/0005-surface-sam.patch

@@ -0,0 +1,104 @@
+From c1b8274dee39c791322ef35b56d667257e69bdd1 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 10 Oct 2021 01:27:17 +0200
+Subject: [PATCH] platform/surface: aggregator_registry: Add support for
+ Surface Laptop Studio
+
+Add support for the Surface Laptop Studio.
+
+In contrast to previous Surface Laptop models, this one has its HID
+devices attached to target ID 1 (instead of 2). It also has a couple
+more of them, including a new notifier for when the pen is stashed /
+taken out of its place, a "Sys Control" device, and two other
+unidentified HID devices with unknown usages.
+
+Battery and performance profile interfaces remain the same.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ .../surface/surface_aggregator_registry.c     | 54 +++++++++++++++++++
+ 1 file changed, 54 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index 4428c4330229..1679811eff50 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -77,6 +77,42 @@ static const struct software_node ssam_node_bas_dtx = {
+ 	.parent = &ssam_node_root,
+ };
+ 
++/* HID keyboard (TID1). */
++static const struct software_node ssam_node_hid_tid1_keyboard = {
++	.name = "ssam:01:15:01:01:00",
++	.parent = &ssam_node_root,
++};
++
++/* HID pen stash (TID1; pen taken / stashed away evens). */
++static const struct software_node ssam_node_hid_tid1_penstash = {
++	.name = "ssam:01:15:01:02:00",
++	.parent = &ssam_node_root,
++};
++
++/* HID touchpad (TID1). */
++static const struct software_node ssam_node_hid_tid1_touchpad = {
++	.name = "ssam:01:15:01:03:00",
++	.parent = &ssam_node_root,
++};
++
++/* HID device instance 6 (TID1, unknown HID device). */
++static const struct software_node ssam_node_hid_tid1_iid6 = {
++	.name = "ssam:01:15:01:06:00",
++	.parent = &ssam_node_root,
++};
++
++/* HID device instance 7 (TID1, unknown HID device). */
++static const struct software_node ssam_node_hid_tid1_iid7 = {
++	.name = "ssam:01:15:01:07:00",
++	.parent = &ssam_node_root,
++};
++
++/* HID system controls (TID1). */
++static const struct software_node ssam_node_hid_tid1_sysctrl = {
++	.name = "ssam:01:15:01:08:00",
++	.parent = &ssam_node_root,
++};
++
+ /* HID keyboard. */
+ static const struct software_node ssam_node_hid_main_keyboard = {
+ 	.name = "ssam:01:15:02:01:00",
+@@ -159,6 +195,21 @@ static const struct software_node *ssam_node_group_sl3[] = {
+ 	NULL,
+ };
+ 
++/* Devices for Surface Laptop Studio. */
++static const struct software_node *ssam_node_group_sls[] = {
++	&ssam_node_root,
++	&ssam_node_bat_ac,
++	&ssam_node_bat_main,
++	&ssam_node_tmp_pprof,
++	&ssam_node_hid_tid1_keyboard,
++	&ssam_node_hid_tid1_penstash,
++	&ssam_node_hid_tid1_touchpad,
++	&ssam_node_hid_tid1_iid6,
++	&ssam_node_hid_tid1_iid7,
++	&ssam_node_hid_tid1_sysctrl,
++	NULL,
++};
++
+ /* Devices for Surface Laptop Go. */
+ static const struct software_node *ssam_node_group_slg1[] = {
+ 	&ssam_node_root,
+@@ -507,6 +558,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
+ 	/* Surface Laptop Go 1 */
+ 	{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },
+ 
++	/* Surface Laptop Studio */
++	{ "MSHW0123", (unsigned long)ssam_node_group_sls },
++
+ 	{ },
+ };
+ MODULE_DEVICE_TABLE(acpi, ssam_platform_hub_match);
+-- 
+2.33.0
+

+ 2 - 2
patches/5.14/0005-surface-sam-over-hid.patch → patches/5.14/0006-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 34def80d21055c1b721f0fd80a8109119933d80c Mon Sep 17 00:00:00 2001
+From 4b4cdc77b63a15070360d6caff135da7bc941207 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -110,7 +110,7 @@ index 6f0aa0ed3241..13eb5ac82729 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 62ed523c7667bb8e75489c37f87d1241a3a055a2 Mon Sep 17 00:00:00 2001
+From e45ed9962f0cc343940998cd01bf84fc77a195d3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch

+ 48 - 0
patches/5.14/0007-surface-gpe.patch

@@ -0,0 +1,48 @@
+From 72167f6ad1e545bfe948478f33bfa76075f81a99 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 10 Oct 2021 00:02:44 +0200
+Subject: [PATCH] platform/surface: gpe: Add support for Surface Laptop Studio
+
+The new Surface Laptop Studio uses GPEs for lid events as well. Add an
+entry for that so that the lid can be used to wake the device.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-gpe
+---
+ drivers/platform/surface/surface_gpe.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
+index 86f6991b1215..c1775db29efb 100644
+--- a/drivers/platform/surface/surface_gpe.c
++++ b/drivers/platform/surface/surface_gpe.c
+@@ -26,6 +26,11 @@ static const struct property_entry lid_device_props_l17[] = {
+ 	{},
+ };
+ 
++static const struct property_entry lid_device_props_l4B[] = {
++	PROPERTY_ENTRY_U32("gpe", 0x4B),
++	{},
++};
++
+ static const struct property_entry lid_device_props_l4D[] = {
+ 	PROPERTY_ENTRY_U32("gpe", 0x4D),
+ 	{},
+@@ -158,6 +163,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
+ 		},
+ 		.driver_data = (void *)lid_device_props_l4D,
+ 	},
++	{
++		.ident = "Surface Laptop Studio",
++		.matches = {
++			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
++			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop Studio"),
++		},
++		.driver_data = (void *)lid_device_props_l4B,
++	},
+ 	{ }
+ };
+ 
+-- 
+2.33.0
+

+ 2 - 2
patches/5.14/0010-surface-button.patch → patches/5.14/0008-surface-button.patch

@@ -1,4 +1,4 @@
-From 5d95fd4c0155e31f6a7a33d7cbe40cbee3b1ab4f Mon Sep 17 00:00:00 2001
+From bf37800b07058834b8cff20024a474d9ee124fc8 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:05:09 +1100
 Date: Tue, 5 Oct 2021 00:05:09 +1100
 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@@ -75,7 +75,7 @@ index cb6ec59a045d..4e8944f59def 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 23283377042d5a2ad10fd8ee8b462eb5b83cf243 Mon Sep 17 00:00:00 2001
+From 170e908cbe009ec1c06423d13694659fa35f675d Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:22:57 +1100
 Date: Tue, 5 Oct 2021 00:22:57 +1100
 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd

+ 1 - 1
patches/5.14/0006-surface-typecover.patch → patches/5.14/0009-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 2b3096e501b24f17890f1ecdd4b3035b086e2374 Mon Sep 17 00:00:00 2001
+From 8c73eec279ad1f707fdf875f03e96f13badfb1d5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when

+ 19 - 19
patches/5.14/0007-cameras.patch → patches/5.14/0010-cameras.patch

@@ -1,4 +1,4 @@
-From f780a28a40e3799b3d92808279cd6d3ef95ac2c6 Mon Sep 17 00:00:00 2001
+From 4dabc3cdc55b9f82c777201aa11cd6a32e7148a4 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 5 Apr 2021 23:56:53 +0100
 Date: Mon, 5 Apr 2021 23:56:53 +0100
 Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops
 Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops
@@ -58,7 +58,7 @@ index 47db0ee0fcbf..7bb86e246ebe 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 89648fa3a3b97b0ca970920231211fad3226b347 Mon Sep 17 00:00:00 2001
+From 2abf9785d736eafda087b3f7771d685413af00e8 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 5 Apr 2021 23:56:54 +0100
 Date: Mon, 5 Apr 2021 23:56:54 +0100
 Subject: [PATCH] media: i2c: Add support for ov5693 sensor
 Subject: [PATCH] media: i2c: Add support for ov5693 sensor
@@ -1701,7 +1701,7 @@ index 000000000000..9499ee10f56c
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 35479d2c39559affa4d4a16b3ba9f1f72fd886a9 Mon Sep 17 00:00:00 2001
+From 884afe12a4437f1ee5e08b655abe386836ae6e8a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Fri, 22 Jan 2021 20:58:13 +0100
 Date: Fri, 22 Jan 2021 20:58:13 +0100
 Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation
 Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation
@@ -1864,7 +1864,7 @@ index dd0ffcafa489..924d99d20328 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 14547b3ba796e0ced8d2e1653db0d8bf614da848 Mon Sep 17 00:00:00 2001
+From e7a95632282a47777ebd8e2d69a0022d35291ce1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Sun, 24 Jan 2021 11:07:42 +0100
 Date: Sun, 24 Jan 2021 11:07:42 +0100
 Subject: [PATCH] cio2-bridge: Use macros and add warnings
 Subject: [PATCH] cio2-bridge: Use macros and add warnings
@@ -1968,7 +1968,7 @@ index 924d99d20328..e1e388cc9f45 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From a21de2b837e3e932d7fcdb6c20146accb339ae26 Mon Sep 17 00:00:00 2001
+From 0b43ede1bba94c58888bf952762964eab9cdb2af Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Thu, 6 May 2021 07:52:44 +0200
 Date: Thu, 6 May 2021 07:52:44 +0200
 Subject: [PATCH] cio2-bridge: Use correct dev_properties size
 Subject: [PATCH] cio2-bridge: Use correct dev_properties size
@@ -1994,7 +1994,7 @@ index e1e388cc9f45..deaf5804f70d 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 00c02cabde9897b069f0df76b9995867e19cd03f Mon Sep 17 00:00:00 2001
+From 0fba840f5adb6cb93e214a3ee2d6083d1693cb16 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 20 May 2021 23:31:04 +0100
 Date: Thu, 20 May 2021 23:31:04 +0100
 Subject: [PATCH] media: i2c: Fix vertical flip in ov5693
 Subject: [PATCH] media: i2c: Fix vertical flip in ov5693
@@ -2029,7 +2029,7 @@ index 9499ee10f56c..c558f9b48c83 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 912cb7100d7c7a8c23cae6d43f190a48b378c810 Mon Sep 17 00:00:00 2001
+From 31c36b2980406c72d402a5c5b3051f91c81372d0 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 9 Jul 2021 16:39:18 +0100
 Date: Fri, 9 Jul 2021 16:39:18 +0100
 Subject: [PATCH] media: i2c: Add ACPI support to ov8865
 Subject: [PATCH] media: i2c: Add ACPI support to ov8865
@@ -2080,7 +2080,7 @@ index ce50f3ea87b8..fe60cda3dea7 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 71350668869ec2016909d1d1043f5cd170a92f1e Mon Sep 17 00:00:00 2001
+From ba264bf9dc39c47dceb815e4d3b6c335eb05b8a3 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 21:20:17 +0100
 Date: Sat, 10 Jul 2021 21:20:17 +0100
 Subject: [PATCH] media: i2c: Fix incorrect value in comment
 Subject: [PATCH] media: i2c: Fix incorrect value in comment
@@ -2110,7 +2110,7 @@ index fe60cda3dea7..2ef146e7e7ef 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 4e8156f3bfe70a91d970e979171ba4e9f3db8a6c Mon Sep 17 00:00:00 2001
+From 30d95881c9e397334cc54c0e240d4e271f8b4ead Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:21:52 +0100
 Date: Sat, 10 Jul 2021 22:21:52 +0100
 Subject: [PATCH] media: i2c: Check fwnode->secondary for endpoint
 Subject: [PATCH] media: i2c: Check fwnode->secondary for endpoint
@@ -2159,7 +2159,7 @@ index 2ef146e7e7ef..a3199721bbca 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 20829156918c4e2d4cef44733e6b271913f3dd40 Mon Sep 17 00:00:00 2001
+From 357b44338b8d5104e47733e76a6ca58a2b6dacee Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:00:25 +0100
 Date: Sat, 10 Jul 2021 22:00:25 +0100
 Subject: [PATCH] media: i2c: Support 19.2MHz input clock in ov8865
 Subject: [PATCH] media: i2c: Support 19.2MHz input clock in ov8865
@@ -2474,7 +2474,7 @@ index a3199721bbca..53e6bcbe18d6 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From afc4b3f3de26b91d2587698f370fef1c7f7f725b Mon Sep 17 00:00:00 2001
+From 69fb738419ab075db8cd290ff0a489cf996832ec Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:19:10 +0100
 Date: Sat, 10 Jul 2021 22:19:10 +0100
 Subject: [PATCH] media: i2c: Add .get_selection() support to ov8865
 Subject: [PATCH] media: i2c: Add .get_selection() support to ov8865
@@ -2576,7 +2576,7 @@ index 53e6bcbe18d6..2f487c25ed56 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From e0b1400c8e1867d90177c989b2ace225087c9051 Mon Sep 17 00:00:00 2001
+From 6f2f77d45f7214a005df9e7941b12d2eab92010e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:34:43 +0100
 Date: Sat, 10 Jul 2021 22:34:43 +0100
 Subject: [PATCH] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN
 Subject: [PATCH] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN
@@ -2627,7 +2627,7 @@ index 2f487c25ed56..b91c952b6ef9 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From e01070b2e19699f73ec886777d6c3b01e22c318e Mon Sep 17 00:00:00 2001
+From 3e5eb549e849e4ccd5930b2c654f975f2333be4b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 12 Jul 2021 22:54:56 +0100
 Date: Mon, 12 Jul 2021 22:54:56 +0100
 Subject: [PATCH] media: i2c: Add vblank control to ov8865
 Subject: [PATCH] media: i2c: Add vblank control to ov8865
@@ -2737,7 +2737,7 @@ index b91c952b6ef9..4430115607a4 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 8dccf0e592dcb566a1ced6af9ce5b69672b5ceee Mon Sep 17 00:00:00 2001
+From d3c9cbafd556558b06e8c2864d6203c2d05842f2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 13 Jul 2021 23:40:33 +0100
 Date: Tue, 13 Jul 2021 23:40:33 +0100
 Subject: [PATCH] media: i2c: Add hblank control to ov8865
 Subject: [PATCH] media: i2c: Add hblank control to ov8865
@@ -2807,7 +2807,7 @@ index 4430115607a4..e9b5f4d8e79b 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From ec400b9d41c1c5bf4c0d85a09738ff90109ed1a1 Mon Sep 17 00:00:00 2001
+From ab7c5d158523653f7d4ff9dbac8069064acc43ff Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 13 Jul 2021 23:43:17 +0100
 Date: Tue, 13 Jul 2021 23:43:17 +0100
 Subject: [PATCH] media: i2c: cap exposure at height + vblank in ov8865
 Subject: [PATCH] media: i2c: cap exposure at height + vblank in ov8865
@@ -2888,7 +2888,7 @@ index e9b5f4d8e79b..893cc58dc265 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 9f3791fbb2e33485132356371089729f78a6c3d4 Mon Sep 17 00:00:00 2001
+From f8420f12f45125e4a9e39f9655274d0293854938 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 14 Jul 2021 18:05:44 +0100
 Date: Wed, 14 Jul 2021 18:05:44 +0100
 Subject: [PATCH] media: i2c: Remove unused macros from ov8865
 Subject: [PATCH] media: i2c: Remove unused macros from ov8865
@@ -3162,7 +3162,7 @@ index 893cc58dc265..fb81b822987d 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 24938dbe849e4f173a7d7ed25fa7b201dd5b19fa Mon Sep 17 00:00:00 2001
+From cf272e58c4da47b657f06d19d17a2d9192dfd51e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 16 Jul 2021 00:00:54 +0100
 Date: Fri, 16 Jul 2021 00:00:54 +0100
 Subject: [PATCH] media: i2c: Switch exposure control unit to lines
 Subject: [PATCH] media: i2c: Switch exposure control unit to lines
@@ -3209,7 +3209,7 @@ index fb81b822987d..27520c731e47 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 25e216b42324860fd1887a5df35ecfa427563280 Mon Sep 17 00:00:00 2001
+From dbc0ad1a42658023c0a48de4d7a9a3e1021d50da Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 16 Jul 2021 22:56:15 +0100
 Date: Fri, 16 Jul 2021 22:56:15 +0100
 Subject: [PATCH] media: i2c: Add controls from fwnode to ov8865
 Subject: [PATCH] media: i2c: Add controls from fwnode to ov8865
@@ -3254,7 +3254,7 @@ index 27520c731e47..f746917719ae 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From f15fc0d97b5cbd139ba98bcb878c944879586458 Mon Sep 17 00:00:00 2001
+From 5af2efbf2038a632b0fce63c56f32d79905a09c0 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 14 Jul 2021 00:05:04 +0100
 Date: Wed, 14 Jul 2021 00:05:04 +0100
 Subject: [PATCH] media: ipu3-cio2: Add INT347A to cio2-bridge
 Subject: [PATCH] media: ipu3-cio2: Add INT347A to cio2-bridge

+ 5 - 5
patches/5.14/0008-amd-gpio.patch → patches/5.14/0011-amd-gpio.patch

@@ -1,4 +1,4 @@
-From d360f1de2a3ccb93264adcc7f720feb07cbc4022 Mon Sep 17 00:00:00 2001
+From cf69d2cb9e666787650793264fee1054cc732164 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 17:47:38 +1000
 Date: Sat, 29 May 2021 17:47:38 +1000
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@@ -65,7 +65,7 @@ index e55e0c1fad8c..46dfad41b401 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 8c0a240e9cf709de709c6ea459e47bf7a26fa8b1 Mon Sep 17 00:00:00 2001
+From aa96003b90d61a21b31918f82c5c6355a4001d4a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
@@ -107,7 +107,7 @@ index 46dfad41b401..78bf6a097dc5 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From c1f3374ca55c093b6202f07ef003b2f3eb961d46 Mon Sep 17 00:00:00 2001
+From 39f847d69442b5e304cc65640c82bb7fd40ff6a3 Mon Sep 17 00:00:00 2001
 From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Date: Tue, 31 Aug 2021 17:36:12 +0530
 Date: Tue, 31 Aug 2021 17:36:12 +0530
 Subject: [PATCH] pinctrl: amd: Add irq field data
 Subject: [PATCH] pinctrl: amd: Add irq field data
@@ -173,7 +173,7 @@ index 95e763424042..1d4317073654 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From dd2c15cec4be468f5a50e269d0f91e0b8b9cdb08 Mon Sep 17 00:00:00 2001
+From bf16033230ac5ccc0ce86b9d80a922889a82e2f3 Mon Sep 17 00:00:00 2001
 From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Date: Tue, 31 Aug 2021 17:36:13 +0530
 Date: Tue, 31 Aug 2021 17:36:13 +0530
 Subject: [PATCH] pinctrl: amd: Handle wake-up interrupt
 Subject: [PATCH] pinctrl: amd: Handle wake-up interrupt
@@ -220,7 +220,7 @@ index 79b8b7f91996..d19974aceb2e 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 66c53ac510c9cf9df6e9ac4f405914ca24b3ccb7 Mon Sep 17 00:00:00 2001
+From 366f90a94f6ad242fce985b4f39384ce9edce375 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 From: Sachi King <nakato@nakato.io>
 Date: Fri, 1 Oct 2021 21:19:09 +1000
 Date: Fri, 1 Oct 2021 21:19:09 +1000
 Subject: [PATCH] pinctrl: amd: disable and mask interrupts on probe
 Subject: [PATCH] pinctrl: amd: disable and mask interrupts on probe

+ 2 - 2
patches/5.14/0009-amd-s0ix.patch → patches/5.14/0012-amd-s0ix.patch

@@ -1,4 +1,4 @@
-From 26e3b115246a289e611663a3985f0a81148bab78 Mon Sep 17 00:00:00 2001
+From 2b59a2d0ead61b980c42526b883dc5619caef5d0 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 22:27:25 +1000
 Date: Sat, 29 May 2021 22:27:25 +1000
 Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
 Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
@@ -31,7 +31,7 @@ index d6a7c896ac86..fc95620101e8 100644
 -- 
 -- 
 2.33.0
 2.33.0
 
 
-From 3fb90b0d3770441ff16b6d8b3926778ef68476b0 Mon Sep 17 00:00:00 2001
+From f686158a4826bc37268e7fb592df1f57b8aae421 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 2 Oct 2021 13:39:36 +1000
 Date: Sat, 2 Oct 2021 13:39:36 +1000
 Subject: [PATCH] ACPI: PM: Include alternate AMDI0005 id in special behaviour
 Subject: [PATCH] ACPI: PM: Include alternate AMDI0005 id in special behaviour

+ 0 - 1
pkg/arch/kernel/0005-surface-sam-over-hid.patch

@@ -1 +0,0 @@
-../../../patches/5.14/0005-surface-sam-over-hid.patch

+ 1 - 0
pkg/arch/kernel/0005-surface-sam.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0005-surface-sam.patch

+ 1 - 0
pkg/arch/kernel/0006-surface-sam-over-hid.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0006-surface-sam-over-hid.patch

+ 0 - 1
pkg/arch/kernel/0006-surface-typecover.patch

@@ -1 +0,0 @@
-../../../patches/5.14/0006-surface-typecover.patch

+ 0 - 1
pkg/arch/kernel/0007-cameras.patch

@@ -1 +0,0 @@
-../../../patches/5.14/0007-cameras.patch

+ 1 - 0
pkg/arch/kernel/0007-surface-gpe.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0007-surface-gpe.patch

+ 0 - 1
pkg/arch/kernel/0008-amd-gpio.patch

@@ -1 +0,0 @@
-../../../patches/5.14/0008-amd-gpio.patch

+ 1 - 0
pkg/arch/kernel/0008-surface-button.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0008-surface-button.patch

+ 0 - 1
pkg/arch/kernel/0009-amd-s0ix.patch

@@ -1 +0,0 @@
-../../../patches/5.14/0009-amd-s0ix.patch

+ 1 - 0
pkg/arch/kernel/0009-surface-typecover.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0009-surface-typecover.patch

+ 1 - 0
pkg/arch/kernel/0010-cameras.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0010-cameras.patch

+ 0 - 1
pkg/arch/kernel/0010-surface-button.patch

@@ -1 +0,0 @@
-../../../patches/5.14/0010-surface-button.patch

+ 1 - 0
pkg/arch/kernel/0011-amd-gpio.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0011-amd-gpio.patch

+ 1 - 0
pkg/arch/kernel/0012-amd-s0ix.patch

@@ -0,0 +1 @@
+../../../patches/5.14/0012-amd-s0ix.patch

+ 16 - 12
pkg/arch/kernel/PKGBUILD

@@ -31,12 +31,14 @@ source=(
   0002-mwifiex.patch
   0002-mwifiex.patch
   0003-ath10k.patch
   0003-ath10k.patch
   0004-ipts.patch
   0004-ipts.patch
-  0005-surface-sam-over-hid.patch
-  0006-surface-typecover.patch
-  0007-cameras.patch
-  0008-amd-gpio.patch
-  0009-amd-s0ix.patch
-  0010-surface-button.patch
+  0005-surface-sam.patch
+  0006-surface-sam-over-hid.patch
+  0007-surface-gpe.patch
+  0008-surface-button.patch
+  0009-surface-typecover.patch
+  0010-cameras.patch
+  0011-amd-gpio.patch
+  0012-amd-s0ix.patch
 )
 )
 validpgpkeys=(
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -51,12 +53,14 @@ sha256sums=('SKIP'
             '4d65710345a753e9b3f9dc3bee742d0cb96feaf83c93cb05d04d9a21bbd411e7'
             '4d65710345a753e9b3f9dc3bee742d0cb96feaf83c93cb05d04d9a21bbd411e7'
             '620e18b5a4b41a19d0de94eb22e6cb4879c2e041f859a5b10784e176efb5a0ba'
             '620e18b5a4b41a19d0de94eb22e6cb4879c2e041f859a5b10784e176efb5a0ba'
             '7a128e27a9476da1d07a5cb39180963dade5493ea10ea4c0e78f23df83ffa102'
             '7a128e27a9476da1d07a5cb39180963dade5493ea10ea4c0e78f23df83ffa102'
-            '5c4449c2cfc0692cc8cea1458a172cc8751ebee268b570b06779b5a22ea687b4'
-            '30320d3e83e59f0859d48efc106900593cd0fddaf915e0ea011d4266378266d7'
-            '959388da490fac316a79a810f9515d41c6d7cc37c99554cb1986eba491fe13a0'
-            '6ebaf49ab7fdb12cd44186dfa81c6d160f35755dfcc96dfc3abe6ce164ce61e5'
-            '38005d093b066145dae22c2c90bbd580ecc954b1514f4195678565b60e265f8f'
-            'a83f63f7d57d747cadde6d065350089320ebd11a58aced0105edade2781dc97a')
+            '113f2ea99360aab5072ee464e345791fd3ccaeb6f4850eb678e6b27677712de9'
+            '1b7bba8f16dafecc3494ceb4573cdf861fef5ba4e738a5012ceeea494ce36d32'
+            'c5e27168e9f684c30af41c624af1f9f1c38ba6edd342739e0b4b84c1404a7134'
+            'c4f1250fd6152937d180664c32fde5f72c7822726404e9b1b50df7fa9c33fa62'
+            'e7e8156459664a6b941dcd1596f2ce2d1ff4c538e59edbbd65be7819f98f1ee9'
+            'c1241ae6126fcb2bffdb4722fa8507ced1faea93bf48d382ced487d0446470d7'
+            'fb766fa81049f83eb648d5967910f22b8901d1780e2e3496193e9a2fdd59fdab'
+            '87e74e6159946bc8313aefdafb61c46ae2d43ae5fb67806b12961ef68e8c510d')
 
 
 
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_HOST=archlinux