Bladeren bron

Update v5.18 patches

Changes:
 - Add support for tablet-mode switch on Surface Go
   (https://github.com/linux-surface/kernel/pull/127, credits go to
   @krnhotwings)
 - Fix driver probe issues preventing cameras from working
   (https://github.com/linux-surface/kernel/pull/128, credits go
   @djrscally)
 - Add support for more SAM events used by the Surface Laptop Studio.
 - Rebase onto v5.18.3

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/d973d23e3270cbb564823234a1fb2d71d2602f9d
Maximilian Luz 3 jaren geleden
bovenliggende
commit
d2956944b7

+ 2 - 2
patches/5.18/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From e574a091b2c968a4bbcaddada28f630290ea5c91 Mon Sep 17 00:00:00 2001
+From 9e217b88989e51ec8ef571eb6f8fb14b8a245480 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
@@ -58,7 +58,7 @@ index ca4602bcc7de..490b9731068a 100644
  	{ }
  };
 diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
-index 197c56047947..9893e9c3cdf7 100644
+index 4b2e027c1033..dc96ec7bcbd5 100644
 --- a/sound/soc/codecs/rt5645.c
 +++ b/sound/soc/codecs/rt5645.c
 @@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {

+ 8 - 8
patches/5.18/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 18c1fbbbbe91f5f8d73f781afa45edca416deb93 Mon Sep 17 00:00:00 2001
+From 25a0c6a709dc1a9f26596c3129a0bf7635ad7a2f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:32:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@@ -183,7 +183,7 @@ index 8ec4176d698f..25370c5a4f59 100644
 -- 
 2.36.1
 
-From 8897f9eedf692369e6db69ae7160871b1166c65e Mon Sep 17 00:00:00 2001
+From 6a393d9129048c454852a65ca86ba52b384f6910 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Wed, 30 Sep 2020 18:08:24 +0900
 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@@ -245,7 +245,7 @@ index 563dd0d5ac79..32e2f000e57b 100644
 -- 
 2.36.1
 
-From fba833e94ca795c590a8436cf55c6b6218d57ce5 Mon Sep 17 00:00:00 2001
+From 862da9d7cc7176460d1436142026c0c89f6fa93c Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -400,7 +400,7 @@ index 25370c5a4f59..a1de111ad1db 100644
 -- 
 2.36.1
 
-From a45f2456e773b1b694f63446b760eb668523b108 Mon Sep 17 00:00:00 2001
+From 8a7062a9a71c4ff75ae648c6c02216169f6d0471 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 3 Nov 2020 13:28:04 +0100
 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@@ -567,7 +567,7 @@ index a1de111ad1db..0e429779bb04 100644
 -- 
 2.36.1
 
-From f50f9d9fd54d364936223f72df665ea59948b795 Mon Sep 17 00:00:00 2001
+From 6effdb02e6ad109279035db4b20d0c3b44991691 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 25 Mar 2021 11:33:02 +0100
 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
@@ -603,7 +603,7 @@ Patchset: mwifiex
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 50df417207af..670dcebe12fa 100644
+index e48c3ad069bb..d7704d4e568d 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -63,6 +63,7 @@ static struct usb_driver btusb_driver;
@@ -622,7 +622,7 @@ index 50df417207af..670dcebe12fa 100644
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
-@@ -3769,6 +3771,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -3775,6 +3777,19 @@ static int btusb_probe(struct usb_interface *intf,
  	if (id->driver_info & BTUSB_MARVELL)
  		hdev->set_bdaddr = btusb_set_bdaddr_marvell;
  
@@ -645,7 +645,7 @@ index 50df417207af..670dcebe12fa 100644
 -- 
 2.36.1
 
-From 4d819fa2aa77fe1435e0d9f1c8db510569b554eb Mon Sep 17 00:00:00 2001
+From a97946211367d2d0894bcb5d0ef52e7112b1080a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 10 Nov 2020 12:49:56 +0100
 Subject: [PATCH] mwifiex: Use non-posted PCI register writes

+ 1 - 1
patches/5.18/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From fdad6d7397202fbca80d69ae6135637fff45d26e Mon Sep 17 00:00:00 2001
+From 827a37482ea6b9efc0d4d3ad7335b4b79dbd2bf9 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Feb 2021 00:45:52 +0100
 Subject: [PATCH] ath10k: Add module parameters to override board files

+ 4 - 4
patches/5.18/0004-ipts.patch

@@ -1,4 +1,4 @@
-From aaf2bc35046e28956818ff457ccab4970fc2d58d Mon Sep 17 00:00:00 2001
+From 29fb74b92342266c45a9ba3a508d43fb186dd7b8 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 30 Jul 2020 13:21:53 +0200
 Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@@ -36,7 +36,7 @@ index 33e58821e478..fde0ad009b17 100644
 -- 
 2.36.1
 
-From 7f9ae7ad149bee7d37c1b24dc51773ca124d3202 Mon Sep 17 00:00:00 2001
+From f74694992e29ef9ee1508aa1b3a32445566abd67 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 6 Aug 2020 11:20:41 +0200
 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus
@@ -1501,7 +1501,7 @@ index 000000000000..53fb86a88f97
 -- 
 2.36.1
 
-From 9c4eade5a9213b8dc686d0f35860ff112d308b4a Mon Sep 17 00:00:00 2001
+From e76adda0bdbfab9c186b670aa69a3832ff45aaa9 Mon Sep 17 00:00:00 2001
 From: Liban Hannan <liban.p@gmail.com>
 Date: Tue, 12 Apr 2022 23:31:12 +0100
 Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS
@@ -1523,7 +1523,7 @@ Patchset: ipts
  1 file changed, 24 insertions(+)
 
 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 0ea47e17b379..f437c0118c00 100644
+index ba9a63cac47c..5f18ec206696 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,8 @@

+ 234 - 16
patches/5.18/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From 11cb4f8c05666e7092892e306e22b5e0b2d1c91b Mon Sep 17 00:00:00 2001
+From 3434dbd2d1886acb555aa603115977157fe60076 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 00:24:47 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow devices to be marked as
@@ -104,7 +104,7 @@ index cc257097eb05..491aa7e9f4bc 100644
 -- 
 2.36.1
 
-From 69be483916d47a555690ce409e620cb39e9b0c3e Mon Sep 17 00:00:00 2001
+From 320b2dbe78b787308902bc68e22fcbb3f162cedb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 00:48:22 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow notifiers to avoid
@@ -397,7 +397,7 @@ index 491aa7e9f4bc..ad245c6b00d0 100644
 -- 
 2.36.1
 
-From 01a341b88606f2e4523134a2ec17a21b7c252370 Mon Sep 17 00:00:00 2001
+From 9eb459188c5879f24339596858348da5db721271 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 01:20:49 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Use client device
@@ -446,7 +446,7 @@ index ce2bd88feeaa..9f630e890ff7 100644
 -- 
 2.36.1
 
-From 337f42d4d9482d3d1fcc81f86e0615b7dbed8f43 Mon Sep 17 00:00:00 2001
+From 37b01e0295741ce94882f428ef9a9370011ac41a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 28 Oct 2021 03:37:06 +0200
 Subject: [PATCH] power/supply: surface_charger: Use client device wrappers for
@@ -486,7 +486,7 @@ index a060c36c7766..59182d55742d 100644
 -- 
 2.36.1
 
-From bcd638f85b4838e83cff7df5e6b84f6d2a72a4c2 Mon Sep 17 00:00:00 2001
+From 67d56ec629a03cd48b463916ff728ffc4a614b31 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 28 Oct 2021 03:38:09 +0200
 Subject: [PATCH] power/supply: surface_battery: Use client device wrappers for
@@ -526,7 +526,7 @@ index 5ec2e6bb2465..540707882bb0 100644
 -- 
 2.36.1
 
-From cd0d0fd5cb8891a768117a4b942930fdd948daa4 Mon Sep 17 00:00:00 2001
+From 10fd3298f566a122fa1a1c6420b40a904f3667c7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 01:33:02 +0200
 Subject: [PATCH] HID: surface-hid: Add support for hot-removal
@@ -637,7 +637,7 @@ index e46330b2e561..87637f813de2 100644
 -- 
 2.36.1
 
-From 3c1d8a475299af30b1a048d1b256374284aae1b7 Mon Sep 17 00:00:00 2001
+From e020481acbc3da350ae62778fed7fd058dff9c6c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 31 Oct 2021 12:34:08 +0100
 Subject: [PATCH] platform/surface: aggregator: Add comment for KIP subsystem
@@ -675,7 +675,7 @@ index c3de43edcffa..26b95ec12733 100644
 -- 
 2.36.1
 
-From e6e17e3230c3d67976b698b1ee055d7c8ed39e42 Mon Sep 17 00:00:00 2001
+From b5492006e8141f4bdd5f87468810f973daa63a55 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 29 Apr 2022 22:42:32 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Generify subsystem hub
@@ -1062,7 +1062,7 @@ index 9f630e890ff7..09cbeee2428b 100644
 -- 
 2.36.1
 
-From 974e92e633c22cbf9bcdc4e0669ee5464bfd602e Mon Sep 17 00:00:00 2001
+From 4b3ea8d79aa4330de8f2d5ec3f8fae3409874040 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 29 Apr 2022 23:02:06 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add KIP device hub
@@ -1224,7 +1224,7 @@ index 09cbeee2428b..1e60435c7cce 100644
 -- 
 2.36.1
 
-From b2163fb7f8188fd153f72b6fc83e94eba6c2fb2f Mon Sep 17 00:00:00 2001
+From a6b06ffdac171f945aaaaf58dea38f3824c7e24b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 27 Oct 2021 22:33:03 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -1322,7 +1322,7 @@ index 1e60435c7cce..ab69669316bd 100644
 -- 
 2.36.1
 
-From 61fae5943305a2f16d74f813c2e4648585ded62b Mon Sep 17 00:00:00 2001
+From 61037fe8bcd3c36dba5d21dabae06526e95104f7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 03:19:20 +0200
 Subject: [PATCH] platform/surface: Add KIP tablet-mode switch
@@ -1666,7 +1666,7 @@ index 000000000000..27371da71ef2
 -- 
 2.36.1
 
-From c52bb8c58a61e3c4842efe6c325f0f659f39996a Mon Sep 17 00:00:00 2001
+From 847bd4c16209cabfde0f34f58af887559ec8795d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 27 Oct 2021 22:33:03 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@@ -1716,7 +1716,7 @@ index ab69669316bd..c666392d4a9a 100644
 -- 
 2.36.1
 
-From 615cedaf5078fb23d8d6330843a5989ffb3b5aa7 Mon Sep 17 00:00:00 2001
+From 8603de5907a6cb137b7e0fb6faba96588fb3122c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:30:46 +0200
 Subject: [PATCH] platform/surface: aggregator: Move device registry helper
@@ -2105,7 +2105,7 @@ index ad245c6b00d0..6ae110e830b4 100644
 -- 
 2.36.1
 
-From d8a038b9b64c1236478821d79d5b5049b012fba3 Mon Sep 17 00:00:00 2001
+From 9ad07ca5c065d4d5a21948ff0ab1f46b678980ba Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:39:56 +0200
 Subject: [PATCH] platform/surface: aggregator: Move subsystem hub drivers to
@@ -2966,7 +2966,7 @@ index 3261c8141841..11b51aa9ea73 100644
 -- 
 2.36.1
 
-From 9733bfb395839e0cf33b1e3d36d714b0d7c572f1 Mon Sep 17 00:00:00 2001
+From 1a0985222c0c57bd4c0d070da95b4c7e38fe8df2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:51:05 +0200
 Subject: [PATCH] platform/surface: aggregator: Be consistent with hub device
@@ -3028,7 +3028,7 @@ index 11b51aa9ea73..cee7121e7fa6 100644
 -- 
 2.36.1
 
-From 2d3a54490933722f2165f982c04de88e3ba46f31 Mon Sep 17 00:00:00 2001
+From 6bf36758ee63cb97d377028cb00a162256f6db8d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:57:40 +0200
 Subject: [PATCH] platform/surface: Update copyright year of various drivers
@@ -3347,3 +3347,221 @@ index 6373d3b5eb7f..fbf2e11fd6ce 100644
 -- 
 2.36.1
 
+From 10c1426f5e44a66557aee1e81a6d45a4b78b0c38 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Tue, 14 Jun 2022 13:17:49 +0200
+Subject: [PATCH] platform/surface: aggregator: Reserve more event- and
+ target-categories
+
+With the introduction of the Surface Laptop Studio, more event- and
+target categories have been added. Therefore, increase the number of
+reserved events and extend the enum of know target categories.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ drivers/platform/surface/aggregator/trace.h   | 80 +++++++++++--------
+ include/linux/surface_aggregator/serial_hub.h | 75 +++++++++--------
+ 2 files changed, 85 insertions(+), 70 deletions(-)
+
+diff --git a/drivers/platform/surface/aggregator/trace.h b/drivers/platform/surface/aggregator/trace.h
+index 7be0bb097dea..2a2c17771d01 100644
+--- a/drivers/platform/surface/aggregator/trace.h
++++ b/drivers/platform/surface/aggregator/trace.h
+@@ -76,7 +76,7 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_HID);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_TCH);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_BKL);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_TAM);
+-TRACE_DEFINE_ENUM(SSAM_SSH_TC_ACC);
++TRACE_DEFINE_ENUM(SSAM_SSH_TC_ACC0);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_UFI);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_USC);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_PEN);
+@@ -85,6 +85,11 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_AUD);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_SMC);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_KPD);
+ TRACE_DEFINE_ENUM(SSAM_SSH_TC_REG);
++TRACE_DEFINE_ENUM(SSAM_SSH_TC_SPT);
++TRACE_DEFINE_ENUM(SSAM_SSH_TC_SYS);
++TRACE_DEFINE_ENUM(SSAM_SSH_TC_ACC1);
++TRACE_DEFINE_ENUM(SSAM_SSH_TC_SHB);
++TRACE_DEFINE_ENUM(SSAM_SSH_TC_POS);
+ 
+ #define SSAM_PTR_UID_LEN		9
+ #define SSAM_U8_FIELD_NOT_APPLICABLE	((u16)-1)
+@@ -229,40 +234,45 @@ static inline u32 ssam_trace_get_request_tc(const struct ssh_packet *p)
+ 
+ #define ssam_show_ssh_tc(rqid)						\
+ 	__print_symbolic(rqid,						\
+-		{ SSAM_SSH_TC_NOT_APPLICABLE,		"N/A" },	\
+-		{ SSAM_SSH_TC_SAM,			"SAM" },	\
+-		{ SSAM_SSH_TC_BAT,			"BAT" },	\
+-		{ SSAM_SSH_TC_TMP,			"TMP" },	\
+-		{ SSAM_SSH_TC_PMC,			"PMC" },	\
+-		{ SSAM_SSH_TC_FAN,			"FAN" },	\
+-		{ SSAM_SSH_TC_PoM,			"PoM" },	\
+-		{ SSAM_SSH_TC_DBG,			"DBG" },	\
+-		{ SSAM_SSH_TC_KBD,			"KBD" },	\
+-		{ SSAM_SSH_TC_FWU,			"FWU" },	\
+-		{ SSAM_SSH_TC_UNI,			"UNI" },	\
+-		{ SSAM_SSH_TC_LPC,			"LPC" },	\
+-		{ SSAM_SSH_TC_TCL,			"TCL" },	\
+-		{ SSAM_SSH_TC_SFL,			"SFL" },	\
+-		{ SSAM_SSH_TC_KIP,			"KIP" },	\
+-		{ SSAM_SSH_TC_EXT,			"EXT" },	\
+-		{ SSAM_SSH_TC_BLD,			"BLD" },	\
+-		{ SSAM_SSH_TC_BAS,			"BAS" },	\
+-		{ SSAM_SSH_TC_SEN,			"SEN" },	\
+-		{ SSAM_SSH_TC_SRQ,			"SRQ" },	\
+-		{ SSAM_SSH_TC_MCU,			"MCU" },	\
+-		{ SSAM_SSH_TC_HID,			"HID" },	\
+-		{ SSAM_SSH_TC_TCH,			"TCH" },	\
+-		{ SSAM_SSH_TC_BKL,			"BKL" },	\
+-		{ SSAM_SSH_TC_TAM,			"TAM" },	\
+-		{ SSAM_SSH_TC_ACC,			"ACC" },	\
+-		{ SSAM_SSH_TC_UFI,			"UFI" },	\
+-		{ SSAM_SSH_TC_USC,			"USC" },	\
+-		{ SSAM_SSH_TC_PEN,			"PEN" },	\
+-		{ SSAM_SSH_TC_VID,			"VID" },	\
+-		{ SSAM_SSH_TC_AUD,			"AUD" },	\
+-		{ SSAM_SSH_TC_SMC,			"SMC" },	\
+-		{ SSAM_SSH_TC_KPD,			"KPD" },	\
+-		{ SSAM_SSH_TC_REG,			"REG" }		\
++		{ SSAM_SSH_TC_NOT_APPLICABLE,		"N/A"  },	\
++		{ SSAM_SSH_TC_SAM,			"SAM"  },	\
++		{ SSAM_SSH_TC_BAT,			"BAT"  },	\
++		{ SSAM_SSH_TC_TMP,			"TMP"  },	\
++		{ SSAM_SSH_TC_PMC,			"PMC"  },	\
++		{ SSAM_SSH_TC_FAN,			"FAN"  },	\
++		{ SSAM_SSH_TC_PoM,			"PoM"  },	\
++		{ SSAM_SSH_TC_DBG,			"DBG"  },	\
++		{ SSAM_SSH_TC_KBD,			"KBD"  },	\
++		{ SSAM_SSH_TC_FWU,			"FWU"  },	\
++		{ SSAM_SSH_TC_UNI,			"UNI"  },	\
++		{ SSAM_SSH_TC_LPC,			"LPC"  },	\
++		{ SSAM_SSH_TC_TCL,			"TCL"  },	\
++		{ SSAM_SSH_TC_SFL,			"SFL"  },	\
++		{ SSAM_SSH_TC_KIP,			"KIP"  },	\
++		{ SSAM_SSH_TC_EXT,			"EXT"  },	\
++		{ SSAM_SSH_TC_BLD,			"BLD"  },	\
++		{ SSAM_SSH_TC_BAS,			"BAS"  },	\
++		{ SSAM_SSH_TC_SEN,			"SEN"  },	\
++		{ SSAM_SSH_TC_SRQ,			"SRQ"  },	\
++		{ SSAM_SSH_TC_MCU,			"MCU"  },	\
++		{ SSAM_SSH_TC_HID,			"HID"  },	\
++		{ SSAM_SSH_TC_TCH,			"TCH"  },	\
++		{ SSAM_SSH_TC_BKL,			"BKL"  },	\
++		{ SSAM_SSH_TC_TAM,			"TAM"  },	\
++		{ SSAM_SSH_TC_ACC0,			"ACC0" },	\
++		{ SSAM_SSH_TC_UFI,			"UFI"  },	\
++		{ SSAM_SSH_TC_USC,			"USC"  },	\
++		{ SSAM_SSH_TC_PEN,			"PEN"  },	\
++		{ SSAM_SSH_TC_VID,			"VID"  },	\
++		{ SSAM_SSH_TC_AUD,			"AUD"  },	\
++		{ SSAM_SSH_TC_SMC,			"SMC"  },	\
++		{ SSAM_SSH_TC_KPD,			"KPD"  },	\
++		{ SSAM_SSH_TC_REG,			"REG"  },	\
++		{ SSAM_SSH_TC_SPT,			"SPT"  },	\
++		{ SSAM_SSH_TC_SYS,			"SYS"  },	\
++		{ SSAM_SSH_TC_ACC1,			"ACC1" },	\
++		{ SSAM_SSH_TC_SHB,			"SMB"  },	\
++		{ SSAM_SSH_TC_POS,			"POS"  }	\
+ 	)
+ 
+ DECLARE_EVENT_CLASS(ssam_frame_class,
+diff --git a/include/linux/surface_aggregator/serial_hub.h b/include/linux/surface_aggregator/serial_hub.h
+index 26b95ec12733..45501b6e54e8 100644
+--- a/include/linux/surface_aggregator/serial_hub.h
++++ b/include/linux/surface_aggregator/serial_hub.h
+@@ -201,7 +201,7 @@ static inline u16 ssh_crc(const u8 *buf, size_t len)
+  * exception of zero, which is not an event ID. Thus, this is also the
+  * absolute maximum number of event handlers that can be registered.
+  */
+-#define SSH_NUM_EVENTS		34
++#define SSH_NUM_EVENTS		38
+ 
+ /*
+  * SSH_NUM_TARGETS - The number of communication targets used in the protocol.
+@@ -292,40 +292,45 @@ struct ssam_span {
+  * Windows driver.
+  */
+ enum ssam_ssh_tc {
+-				/* Category 0x00 is invalid for EC use. */
+-	SSAM_SSH_TC_SAM = 0x01,	/* Generic system functionality, real-time clock. */
+-	SSAM_SSH_TC_BAT = 0x02,	/* Battery/power subsystem. */
+-	SSAM_SSH_TC_TMP = 0x03,	/* Thermal subsystem. */
+-	SSAM_SSH_TC_PMC = 0x04,
+-	SSAM_SSH_TC_FAN = 0x05,
+-	SSAM_SSH_TC_PoM = 0x06,
+-	SSAM_SSH_TC_DBG = 0x07,
+-	SSAM_SSH_TC_KBD = 0x08,	/* Legacy keyboard (Laptop 1/2). */
+-	SSAM_SSH_TC_FWU = 0x09,
+-	SSAM_SSH_TC_UNI = 0x0a,
+-	SSAM_SSH_TC_LPC = 0x0b,
+-	SSAM_SSH_TC_TCL = 0x0c,
+-	SSAM_SSH_TC_SFL = 0x0d,
+-	SSAM_SSH_TC_KIP = 0x0e,	/* Manages detachable peripherals (Pro X/8 keyboard cover) */
+-	SSAM_SSH_TC_EXT = 0x0f,
+-	SSAM_SSH_TC_BLD = 0x10,
+-	SSAM_SSH_TC_BAS = 0x11,	/* Detachment system (Surface Book 2/3). */
+-	SSAM_SSH_TC_SEN = 0x12,
+-	SSAM_SSH_TC_SRQ = 0x13,
+-	SSAM_SSH_TC_MCU = 0x14,
+-	SSAM_SSH_TC_HID = 0x15,	/* Generic HID input subsystem. */
+-	SSAM_SSH_TC_TCH = 0x16,
+-	SSAM_SSH_TC_BKL = 0x17,
+-	SSAM_SSH_TC_TAM = 0x18,
+-	SSAM_SSH_TC_ACC = 0x19,
+-	SSAM_SSH_TC_UFI = 0x1a,
+-	SSAM_SSH_TC_USC = 0x1b,
+-	SSAM_SSH_TC_PEN = 0x1c,
+-	SSAM_SSH_TC_VID = 0x1d,
+-	SSAM_SSH_TC_AUD = 0x1e,
+-	SSAM_SSH_TC_SMC = 0x1f,
+-	SSAM_SSH_TC_KPD = 0x20,
+-	SSAM_SSH_TC_REG = 0x21,	/* Extended event registry. */
++				  /* Category 0x00 is invalid for EC use. */
++	SSAM_SSH_TC_SAM  = 0x01,  /* Generic system functionality, real-time clock. */
++	SSAM_SSH_TC_BAT  = 0x02,  /* Battery/power subsystem. */
++	SSAM_SSH_TC_TMP  = 0x03,  /* Thermal subsystem. */
++	SSAM_SSH_TC_PMC  = 0x04,
++	SSAM_SSH_TC_FAN  = 0x05,
++	SSAM_SSH_TC_PoM  = 0x06,
++	SSAM_SSH_TC_DBG  = 0x07,
++	SSAM_SSH_TC_KBD  = 0x08,  /* Legacy keyboard (Laptop 1/2). */
++	SSAM_SSH_TC_FWU  = 0x09,
++	SSAM_SSH_TC_UNI  = 0x0a,
++	SSAM_SSH_TC_LPC  = 0x0b,
++	SSAM_SSH_TC_TCL  = 0x0c,
++	SSAM_SSH_TC_SFL  = 0x0d,
++	SSAM_SSH_TC_KIP  = 0x0e,  /* Manages detachable peripherals (Pro X/8 keyboard cover) */
++	SSAM_SSH_TC_EXT  = 0x0f,
++	SSAM_SSH_TC_BLD  = 0x10,
++	SSAM_SSH_TC_BAS  = 0x11,  /* Detachment system (Surface Book 2/3). */
++	SSAM_SSH_TC_SEN  = 0x12,
++	SSAM_SSH_TC_SRQ  = 0x13,
++	SSAM_SSH_TC_MCU  = 0x14,
++	SSAM_SSH_TC_HID  = 0x15,  /* Generic HID input subsystem. */
++	SSAM_SSH_TC_TCH  = 0x16,
++	SSAM_SSH_TC_BKL  = 0x17,
++	SSAM_SSH_TC_TAM  = 0x18,
++	SSAM_SSH_TC_ACC0 = 0x19,
++	SSAM_SSH_TC_UFI  = 0x1a,
++	SSAM_SSH_TC_USC  = 0x1b,
++	SSAM_SSH_TC_PEN  = 0x1c,
++	SSAM_SSH_TC_VID  = 0x1d,
++	SSAM_SSH_TC_AUD  = 0x1e,
++	SSAM_SSH_TC_SMC  = 0x1f,
++	SSAM_SSH_TC_KPD  = 0x20,
++	SSAM_SSH_TC_REG  = 0x21,  /* Extended event registry. */
++	SSAM_SSH_TC_SPT  = 0x22,
++	SSAM_SSH_TC_SYS  = 0x23,
++	SSAM_SSH_TC_ACC1 = 0x24,
++	SSAM_SSH_TC_SHB  = 0x25,
++	SSAM_SSH_TC_POS  = 0x26,  /* For obtaining Laptop Studio screen position. */
+ };
+ 
+ 
+-- 
+2.36.1
+

+ 2 - 2
patches/5.18/0006-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 927a62bbd965db4e0bbddf7f4d4410d17379c694 Mon Sep 17 00:00:00 2001
+From ba994f52b3b97105a22f13bafecf2d4ee9af530b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -110,7 +110,7 @@ index 08b561f0709d..d7c397bce0f0 100644
 -- 
 2.36.1
 
-From 209e107c805cab95bd3cce0baa38484b73013789 Mon Sep 17 00:00:00 2001
+From fa7c450818f304618a0fb8fd100e5a191ee1789c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch

+ 40 - 2
patches/5.18/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From 9e4639574703df65179840d951379d1f525a7975 Mon Sep 17 00:00:00 2001
+From b7233663e2174356a234a5b10775ca4b29979926 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:05:09 +1100
 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@@ -75,7 +75,7 @@ index cbb1599a520e..f044c731c6a9 100644
 -- 
 2.36.1
 
-From 3695ee8a0fe905e311b8bd6268661517d6ea4d1a Mon Sep 17 00:00:00 2001
+From f82333cfa47f78fe4e480c423ef5be83a5139259 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:22:57 +1100
 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
@@ -147,3 +147,41 @@ index 242fb690dcaf..30eea54dbb47 100644
 -- 
 2.36.1
 
+From 205e198625d121cbbd781a071f9c9fe77dd48b74 Mon Sep 17 00:00:00 2001
+From: Duke Lee <krnhotwings@gmail.com>
+Date: Fri, 10 Jun 2022 13:49:48 -0700
+Subject: [PATCH] platform/x86/intel: hid: Add Surface Go to VGBS allow list
+
+The Surface Go reports Chassis Type 9 (Laptop,) so the device needs to be
+added to dmi_vgbs_allow_list to enable tablet mode when an attached Type
+Cover is folded back.
+
+Relevant bug report and discussion:
+https://github.com/linux-surface/linux-surface/issues/837
+
+Signed-off-by: Duke Lee <krnhotwings@gmail.com>
+Patchset: surface-button
+---
+ drivers/platform/x86/intel/hid.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
+index 216d31e3403d..79cff1fc675c 100644
+--- a/drivers/platform/x86/intel/hid.c
++++ b/drivers/platform/x86/intel/hid.c
+@@ -122,6 +122,12 @@ static const struct dmi_system_id dmi_vgbs_allow_list[] = {
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible 15-df0xxx"),
+ 		},
+ 	},
++	{
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go"),
++		},
++	},
+ 	{ }
+ };
+ 
+-- 
+2.36.1
+

+ 5 - 5
patches/5.18/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From e9e5cbcf7350399c76342b98a35d4cf97f9163df Mon Sep 17 00:00:00 2001
+From a62db328a10a0285eaf86d9b1d7500a142fa95d6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -34,7 +34,7 @@ Patchset: surface-typecover
  1 file changed, 98 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 99eabfb4145b..bbfcae39f375 100644
+index 6bb3890b0f2c..c28349e90156 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -34,7 +34,10 @@
@@ -216,7 +216,7 @@ index 99eabfb4145b..bbfcae39f375 100644
  	del_timer_sync(&td->release_timer);
  
  	sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
-@@ -2174,6 +2265,11 @@ static const struct hid_device_id mt_devices[] = {
+@@ -2180,6 +2271,11 @@ static const struct hid_device_id mt_devices[] = {
  		MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
  			USB_DEVICE_ID_XIROKU_CSR2) },
  
@@ -231,7 +231,7 @@ index 99eabfb4145b..bbfcae39f375 100644
 -- 
 2.36.1
 
-From 3a33e6f8d42dec0a0e0c608dd8a9021c0845389a Mon Sep 17 00:00:00 2001
+From 6b71dfa064ce5003056808ad61eec2aaea8ba7dd Mon Sep 17 00:00:00 2001
 From: PJungkamp <p.jungkamp@gmail.com>
 Date: Fri, 25 Feb 2022 12:04:25 +0100
 Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet
@@ -260,7 +260,7 @@ Patchset: surface-typecover
  1 file changed, 122 insertions(+), 26 deletions(-)
 
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index bbfcae39f375..d53228452501 100644
+index c28349e90156..61142639be26 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -76,6 +76,7 @@ MODULE_LICENSE("GPL");

+ 3 - 3
patches/5.18/0009-surface-battery.patch

@@ -1,4 +1,4 @@
-From 9261de06016ee191d83bbea352ed143d66f6c61b Mon Sep 17 00:00:00 2001
+From f036fe56c5e8c9423879b71bfc26d87f93c92bea Mon Sep 17 00:00:00 2001
 From: Werner Sembach <wse@tuxedocomputers.com>
 Date: Wed, 27 Apr 2022 17:40:53 +0200
 Subject: [PATCH] ACPI: battery: Make "not-charging" the default on no charging
@@ -81,7 +81,7 @@ index dc208f5f5a1f..306513fec1e1 100644
 -- 
 2.36.1
 
-From 2533e285b9b7bfa87547ce077056b8c1a6d793f3 Mon Sep 17 00:00:00 2001
+From 4f661c18d182d9b83316eddd710978bda0517a60 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 25 May 2022 14:20:10 +0200
 Subject: [PATCH] HID: hid-input: add Surface Go battery quirk
@@ -102,7 +102,7 @@ Patchset: surface-battery
  2 files changed, 3 insertions(+)
 
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 053853a891c5..1b67820707cc 100644
+index c297c63f3ec5..e233726d9a74 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
 @@ -413,6 +413,7 @@

+ 56 - 13
patches/5.18/0010-cameras.patch

@@ -1,4 +1,4 @@
-From 39da3a6373d1831182ac1b5e1b167e24473e6c90 Mon Sep 17 00:00:00 2001
+From b53baacfbcd2a547ad0e4784969eebe06869473b Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Sun, 10 Oct 2021 20:56:57 +0200
 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@@ -74,7 +74,7 @@ index 762b61f67e6c..2c0f39a7f2a1 100644
 -- 
 2.36.1
 
-From 09c2ebc75c2a2e8accc0554439b97292e23f6287 Mon Sep 17 00:00:00 2001
+From 35c0175e1402ff220e999442edd29cffa2e710b5 Mon Sep 17 00:00:00 2001
 From: zouxiaoh <xiaohong.zou@intel.com>
 Date: Fri, 25 Jun 2021 08:52:59 +0800
 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
@@ -100,7 +100,7 @@ Patchset: cameras
  1 file changed, 30 insertions(+)
 
 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index f437c0118c00..12b5d13c57db 100644
+index 5f18ec206696..2b31e531f510 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,12 @@
@@ -191,7 +191,7 @@ index f437c0118c00..12b5d13c57db 100644
 -- 
 2.36.1
 
-From cdd22cf98a08d5f2404dd7ab28d588f74e645386 Mon Sep 17 00:00:00 2001
+From df0f136f5385e811d9a24bd1cb7052d8369379a7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 10 Oct 2021 20:57:02 +0200
 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@@ -228,7 +228,7 @@ index 22f61b47f9e5..e1de1ff40bba 100644
 -- 
 2.36.1
 
-From c976a350a7cdd3c81abca49e3b8aa0be1b77886c Mon Sep 17 00:00:00 2001
+From 26044083dcddaba2216fe8e24788b6136e5eae44 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Oct 2021 21:55:16 +0100
 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
@@ -265,10 +265,10 @@ index 38f7f19002ac..194754394f77 100644
  M:	Dongchun Zhu <dongchun.zhu@mediatek.com>
  L:	linux-media@vger.kernel.org
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index fae2baabb773..2a9074a8d054 100644
+index 2b20aa6c37b1..49d1c59334e3 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
-@@ -805,6 +805,17 @@ config VIDEO_DW9714
+@@ -806,6 +806,17 @@ config VIDEO_DW9714
  	  capability. This is designed for linear control of
  	  voice coil motors, controlled via I2C serial interface.
  
@@ -734,7 +734,7 @@ index 000000000000..8451c75b696b
 -- 
 2.36.1
 
-From 57b0975f939a1acbde7dcd2fd7350ef73138ad74 Mon Sep 17 00:00:00 2001
+From b773cc25c71e2812f63ef64c0a1ab130d9456075 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:38:17 +0000
 Subject: [PATCH] media: entity: Skip non-data links in graph iteration
@@ -769,7 +769,7 @@ index 8ab0913d8d82..a8631f74dcee 100644
 -- 
 2.36.1
 
-From 16effbd6b9c96c9cceefa65954e7ddc170142f11 Mon Sep 17 00:00:00 2001
+From 86c89c4a9c53ac8e5c80fbc2d24e3c6134430f0e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:53:09 +0000
 Subject: [PATCH] media: media.h: Add new media link type
@@ -853,7 +853,7 @@ index 200fa8462b90..afbae7213d35 100644
 -- 
 2.36.1
 
-From cb3fd72e7ef525829ab9484de4f1cb570286b4a4 Mon Sep 17 00:00:00 2001
+From 26a660793609a18d76b18e8eb729942fbfc4b582 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:36:31 +0000
 Subject: [PATCH] media: entity: Add link_type_name() helper
@@ -908,7 +908,7 @@ index a8631f74dcee..4bd80ce1a33d 100644
 -- 
 2.36.1
 
-From f4522cbba67621b3d11413966a455fc7677e82c8 Mon Sep 17 00:00:00 2001
+From 7a8c4fd00d798df330cee26fe475e3e1ad2a9827 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:54:10 +0000
 Subject: [PATCH] media: entity: Add support for ancillary links
@@ -985,7 +985,7 @@ index 742918962d46..1d13b8939a11 100644
 -- 
 2.36.1
 
-From 88a01ad062473789b7c45495e243135a18fb1200 Mon Sep 17 00:00:00 2001
+From f34214b06dd0790cac88d76f97f0f8ff2e59257d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 26 Nov 2021 22:55:50 +0000
 Subject: [PATCH] media: v4l2-async: Create links during
@@ -1058,7 +1058,7 @@ index 0404267f1ae4..436bd6900fd8 100644
 -- 
 2.36.1
 
-From 8c9f71bb44a3f86a6c88b199f6fd0f5802b267ba Mon Sep 17 00:00:00 2001
+From 1f3701493379981d00424a46c1bfaf06a35353d2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 4 May 2022 23:21:45 +0100
 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
@@ -1173,3 +1173,46 @@ index 0e9b0503b62a..50682a7b2a07 100644
 -- 
 2.36.1
 
+From d72f2bb8f638e7454445e9e519a5e0841efa8327 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Thu, 2 Jun 2022 22:15:56 +0100
+Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
+
+Removing the .complete() callback had some unintended consequences.
+Because the VCM driver is not directly linked to the ipu3-cio2
+driver .bound() never gets called for it, which means its devnode
+is never created if it probes late. Because .complete() waits for
+any sub-notifiers to also be complete it is captured in that call.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+Patchset: cameras
+---
+ drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+index 50682a7b2a07..ff79582a583d 100644
+--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
++++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+@@ -1429,9 +1429,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
+ 	cio2->queue[s_asd->csi2.port].sensor = NULL;
+ }
+ 
++/* .complete() is called after all subdevices have been located */
++static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)
++{
++	struct cio2_device *cio2 = to_cio2_device(notifier);
++
++	return v4l2_device_register_subdev_nodes(&cio2->v4l2_dev);
++}
++
+ static const struct v4l2_async_notifier_operations cio2_async_ops = {
+ 	.bound = cio2_notifier_bound,
+ 	.unbind = cio2_notifier_unbind,
++	.complete = cio2_notifier_complete,
+ };
+ 
+ static int cio2_parse_firmware(struct cio2_device *cio2)
+-- 
+2.36.1
+

+ 2 - 2
patches/5.18/0011-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 8e5ad1404653beb51399841eb1f245d0660ea9fd Mon Sep 17 00:00:00 2001
+From f99fec7f1341e6ca49ba5aa5f344404bf26c6a87 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 17:47:38 +1000
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@@ -65,7 +65,7 @@ index 0d01e7f5078c..2b06cf5f2b1f 100644
 -- 
 2.36.1
 
-From d7bab966d2e956310804efb2c1d0a89696755540 Mon Sep 17 00:00:00 2001
+From 72e196acf9f43a27aadf750f55f1cd02bc482dfa Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override