Update v5.18 patches

Changes:
 - Add initial SAM support for Surface Laptop Go 2
 - Rebase onto v5.18.10

Links:
 - kernel: 29efb4d11b

patches/5.18/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 6b8bf0fd6dd16fc766ad7206dfb693a44c5bf8a4 Mon Sep 17 00:00:00 2001
+From 2f31dbd1b48562216054ef8b1a86eb4d4a0d00fa 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
@@ -97,5 +97,5 @@ index 6beb00858c33..d82d77387a0a 100644
  };
  
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 443531137b83b966c659c51c0ccd397e502ab6e6 Mon Sep 17 00:00:00 2001
+From 8f41f0d8d8524f49715b2a4260a7c69b0004be98 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
@@ -181,9 +181,9 @@ index 8ec4176d698f..25370c5a4f59 100644
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 +int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
 -- 
-2.36.1
+2.37.0
 
-From 5b7a6fee239c2c44f82fb0a076e9dcf0c28f7ce9 Mon Sep 17 00:00:00 2001
+From 49e85ca2bd9553306dd608c414bcbefc8518b6f6 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
@@ -243,9 +243,9 @@ index 563dd0d5ac79..32e2f000e57b 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From 67172a0a1adb71d858fe7a44df4a69f7cc77c5e6 Mon Sep 17 00:00:00 2001
+From 3a96594c6e3303cfbc7bcd5302e37aa715009fd7 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+
@@ -398,9 +398,9 @@ index 25370c5a4f59..a1de111ad1db 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.36.1
+2.37.0
 
-From a8d8c4eea2c9331e12121459f8b5543a2eb7220c Mon Sep 17 00:00:00 2001
+From a8889fe482cf58bce1b2b7f32e217ede837146e4 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
@@ -565,9 +565,9 @@ index a1de111ad1db..0e429779bb04 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.36.1
+2.37.0
 
-From cbc347b21b9d52d8590303ef3ebd5651aa328f08 Mon Sep 17 00:00:00 2001
+From 8bd0256f221315e7a59bdd44477f687a8d66825b 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
@@ -643,9 +643,9 @@ index e48c3ad069bb..d7704d4e568d 100644
  	    (id->driver_info & BTUSB_MEDIATEK)) {
  		hdev->setup = btusb_mtk_setup;
 -- 
-2.36.1
+2.37.0
 
-From 02282e1b271f2af1e50345d4b4d0cfcc4f18c6e7 Mon Sep 17 00:00:00 2001
+From 503be5cfd84eebc5cb211f1cfa793117bcd82c21 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
@@ -700,5 +700,5 @@ index 24bcd22a2618..b4ad0113a035 100644
  }
  
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From 901770a069fb024af245efa10334f1eb4510f068 Mon Sep 17 00:00:00 2001
+From 6a2d820af848cd7c0d33d7569feabac22eb66aaa 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
@@ -117,5 +117,5 @@ index 9e1f483e1362..34cfce241e4a 100644
  	ret = firmware_request_nowarn(&fw, filename, ar->dev);
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0004-ipts.patch

@@ -1,4 +1,4 @@
-From f9bc4120a72d70761970568493978750f2a00faa Mon Sep 17 00:00:00 2001
+From dc38cdd24db6cb132630937b272c1afbb9586a12 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
@@ -34,9 +34,9 @@ index 5435604327a7..1165ee4f5928 100644
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 -- 
-2.36.1
+2.37.0
 
-From 35acccb7c72e2b182fd3927f225b5c3756e885b1 Mon Sep 17 00:00:00 2001
+From fefd8fb7eb538337f4093ccc1cd933853014ee43 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
@@ -1499,9 +1499,9 @@ index 000000000000..53fb86a88f97
 +
 +#endif /* _IPTS_UAPI_H_ */
 -- 
-2.36.1
+2.37.0
 
-From 5bc7c1e46fbac728d65b72f57a636a0f386c7c67 Mon Sep 17 00:00:00 2001
+From 9b702ebe3888ad5b6219f2810d9e66dbe0d457dd 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
@@ -1599,5 +1599,5 @@ index ba9a63cac47c..5f18ec206696 100644
  {
  	if (risky_device(dev))
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From 2c44b250c6cdd06ba8c4dd1d3348f85856979c69 Mon Sep 17 00:00:00 2001
+From 8575bb94f1450854affff41dda90f3447f3e6d7e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:36 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow is_ssam_device() to be
@@ -53,9 +53,9 @@ index cc257097eb05..62b38b4487eb 100644
   * to_ssam_device() - Casts the given device to a SSAM client device.
   * @d: The device to cast.
 -- 
-2.36.1
+2.37.0
 
-From 23866c4533fc81c04f92a11413a9d0a22d7fd608 Mon Sep 17 00:00:00 2001
+From d53d39de61921867c7e8bb91a4fec35efec2a9bf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:37 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow devices to be marked as
@@ -162,9 +162,9 @@ index 62b38b4487eb..6df7c8d4e50e 100644
   * ssam_device_get() - Increment reference count of SSAM client device.
   * @sdev: The device to increment the reference count of.
 -- 
-2.36.1
+2.37.0
 
-From ed4dd948e57b21ab9fa48244843167561984139e Mon Sep 17 00:00:00 2001
+From e53a3d2dc2521fd23412d0589c3cc46c147ab40a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:38 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow notifiers to avoid
@@ -458,9 +458,9 @@ index 6df7c8d4e50e..c418f7f2732d 100644
 +
  #endif /* _LINUX_SURFACE_AGGREGATOR_DEVICE_H */
 -- 
-2.36.1
+2.37.0
 
-From 2f609473f4fc979bac7d7b0364a1345d18536e83 Mon Sep 17 00:00:00 2001
+From 3b0c00c9b1e64794a2b90c1215e914f309cdb845 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:39 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Use client device
@@ -510,9 +510,9 @@ index ce2bd88feeaa..9f630e890ff7 100644
  	ssam_remove_clients(&sdev->dev);
  }
 -- 
-2.36.1
+2.37.0
 
-From 1eb58307ff7dc5a690098da20d9d376d6719e32c Mon Sep 17 00:00:00 2001
+From 36d1b2b993b2af9d78570d7e5a9af82646578ece Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:40 +0200
 Subject: [PATCH] power/supply: surface_charger: Use client device wrappers for
@@ -554,9 +554,9 @@ index a060c36c7766..59182d55742d 100644
  
  static const struct spwr_psy_properties spwr_psy_props_adp1 = {
 -- 
-2.36.1
+2.37.0
 
-From 1822f66a7cea617d07dd80f7dda48ffba14e9426 Mon Sep 17 00:00:00 2001
+From c57bb9199f41c3da8ea02917184b53e8811df903 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:41 +0200
 Subject: [PATCH] power/supply: surface_battery: Use client device wrappers for
@@ -598,9 +598,9 @@ index 5ec2e6bb2465..540707882bb0 100644
  }
  
 -- 
-2.36.1
+2.37.0
 
-From f8c6b0f74fbe86db209de6fc7c0ffaf573850107 Mon Sep 17 00:00:00 2001
+From 74f87013db2410c520bda85d3aff6b9dcfe4103e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:42 +0200
 Subject: [PATCH] HID: surface-hid: Add support for hot-removal
@@ -712,9 +712,9 @@ index e46330b2e561..87637f813de2 100644
  		return shid->ops.output_report(shid, reportnum, buf, len);
  
 -- 
-2.36.1
+2.37.0
 
-From 950d66f4a8181396383f2d1a6464c16d3d14d9e4 Mon Sep 17 00:00:00 2001
+From fec69423f43d25fca0e1c8fb41b1bc20e0c9dc58 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:43 +0200
 Subject: [PATCH] platform/surface: aggregator: Add comment for KIP subsystem
@@ -753,9 +753,9 @@ index c3de43edcffa..26b95ec12733 100644
  	SSAM_SSH_TC_BLD = 0x10,
  	SSAM_SSH_TC_BAS = 0x11,	/* Detachment system (Surface Book 2/3). */
 -- 
-2.36.1
+2.37.0
 
-From 866aca820343ba09d2cdc696b7c0195708b70972 Mon Sep 17 00:00:00 2001
+From 57004767b41ec99bfc16fbc5c760eca8737195a3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:44 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Generify subsystem hub
@@ -1143,9 +1143,9 @@ index 9f630e890ff7..09cbeee2428b 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From b7495ed4cc4b3fe897234344aa72d9136dcd1462 Mon Sep 17 00:00:00 2001
+From 963d896d5d309e2509e4375512f33ff263d6b05a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:45 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Change device ID for
@@ -1187,9 +1187,9 @@ index 09cbeee2428b..b11ce87c7184 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From 1140b5430b525f3430431b92cd4db233345ec283 Mon Sep 17 00:00:00 2001
+From 87e0ff3e78b15a80437535cb414dab2c5b3bae0f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:46 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add KIP device hub
@@ -1352,9 +1352,9 @@ index b11ce87c7184..f15cef60630f 100644
  	platform_driver_unregister(&ssam_platform_hub_driver);
  }
 -- 
-2.36.1
+2.37.0
 
-From 5ec728d172a5cd31a9a10978a054021b967c2fcd Mon Sep 17 00:00:00 2001
+From 603cb57938adc264a2fbc01ff8e3ba3c87c92df7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:47 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -1453,9 +1453,9 @@ index f15cef60630f..bf3303f1aa71 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From 3734dd6d23a45da855a9730b830aa14565d88fca Mon Sep 17 00:00:00 2001
+From de303dea3582c1ad2837b1c91fc68a7435bc5936 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
@@ -1672,9 +1672,9 @@ index 26b95ec12733..45501b6e54e8 100644
  
  
 -- 
-2.36.1
+2.37.0
 
-From 44439b4c7e056e70771830cbb1329da498dac278 Mon Sep 17 00:00:00 2001
+From c7c779e355c053b5891a20ff780bc46d6a750bda Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 16 Jun 2022 01:50:12 +0200
 Subject: [PATCH] platform/surface: aggregator: Add helper macros for requests
@@ -1882,9 +1882,9 @@ index c418f7f2732d..6cf7e80312d5 100644
  /* -- Helpers for client-device notifiers. ---------------------------------- */
  
 -- 
-2.36.1
+2.37.0
 
-From c22c6e89c6c9f8829a0c1036fb957bd4c01dc66e Mon Sep 17 00:00:00 2001
+From 95b9bc1ecbe8012833fb0a1f697589c137bec4bf 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
@@ -2518,9 +2518,9 @@ index 000000000000..6f402d2ca894
 +MODULE_DESCRIPTION("Tablet mode switch driver for Surface devices using the Surface Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.36.1
+2.37.0
 
-From 439507fe9e2fd1f6cea5221be05f0501f04df33d Mon Sep 17 00:00:00 2001
+From d8176591cd782254b02e29c323f5a63298d55e9f 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
@@ -2568,9 +2568,9 @@ index bf3303f1aa71..8f249df673a4 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From 5081c90032d258d4b75a7e43850af58a24bdc8f7 Mon Sep 17 00:00:00 2001
+From ac503280722194dabbb49bd4eee10ab69d37e2a0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 16 Jun 2022 02:30:16 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@@ -2612,9 +2612,9 @@ index 8f249df673a4..f1c5905f1c16 100644
  	&ssam_node_hid_tid1_penstash,
  	&ssam_node_hid_tid1_touchpad,
 -- 
-2.36.1
+2.37.0
 
-From 49be605a62025621a1d5d54ce1fd1f3ffb134a5d Mon Sep 17 00:00:00 2001
+From 7da546f4e9c9a1187fbec67d3ce9c356004cd5c4 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
@@ -3001,9 +3001,9 @@ index 6cf7e80312d5..6e75fb605479 100644
  /* -- Helpers for client-device requests. ----------------------------------- */
  
 -- 
-2.36.1
+2.37.0
 
-From 74569995b4933f0a5f0769749c438b949443a207 Mon Sep 17 00:00:00 2001
+From ea96cc9c29566b5d5a7299714d5bf6d27652aec4 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
@@ -3888,9 +3888,9 @@ index c680792a037e..0cbb7f3a6b2d 100644
  MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
  MODULE_DESCRIPTION("Device-registry for Surface System Aggregator Module");
 -- 
-2.36.1
+2.37.0
 
-From b9dca029bca8fc9b49e5dc6ee55429e28e589ee2 Mon Sep 17 00:00:00 2001
+From 1cd297008ac04afb8048a59180367132b1872809 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
@@ -4207,12 +4207,12 @@ index 6373d3b5eb7f..fbf2e11fd6ce 100644
  
  #include <asm/unaligned.h>
 -- 
-2.36.1
+2.37.0
 
-From 33fd8e304a0b6ac9d9ed30b942e8dcf69dcc851b Mon Sep 17 00:00:00 2001
+From a1a10d9c00a1ca3b26a6bb0b69dcb9b4a7b71e49 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jun 2022 20:42:00 +0200
-Subject: [PATCH] platform/surface: aggregatgor_registry: Rename HID device
+Subject: [PATCH] platform/surface: aggregator_registry: Rename HID device
  nodes based on their function
 
 Rename HID device nodes based on their function. In particular, these
@@ -4280,12 +4280,12 @@ index d5655f6a4a41..b325fa0c5ee0 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From a3100bf4f8d96f5189608ef785999cab80e7bf69 Mon Sep 17 00:00:00 2001
+From 044783aea90f68116089b663b78cea4188b03d11 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jun 2022 20:52:47 +0200
-Subject: [PATCH] platform/surface: aggregatgor_registry: Rename HID device
+Subject: [PATCH] platform/surface: aggregator_registry: Rename HID device
  nodes based on new findings
 
 On Windows, the HID devices with target ID 1 are grouped as "Surface Hot
@@ -4373,12 +4373,12 @@ index b325fa0c5ee0..3aa825b5aa26 100644
  };
  
 -- 
-2.36.1
+2.37.0
 
-From 885d854c41d4c4e795cd67546e7905f726a98537 Mon Sep 17 00:00:00 2001
+From cb1691f10db3a1f3080694022793db55a7b17d21 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jun 2022 20:54:59 +0200
-Subject: [PATCH] platform/surface: aggregatgor_registry: Add HID devices for
+Subject: [PATCH] platform/surface: aggregator_registry: Add HID devices for
  sensors and USCI client to SP8
 
 Add software nodes for the HID sensor collection and the UCM USCI HID
@@ -4409,5 +4409,37 @@ index 3aa825b5aa26..4c2f9f789354 100644
  };
  
 -- 
-2.36.1
+2.37.0
+
+From 373b9c954a5e1ded460af61e528617d8101e5eae Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Fri, 8 Jul 2022 03:34:44 +0200
+Subject: [PATCH] platform/surface: aggregator_registry: Add support for
+ Surface Laptop Go 2
+
+The Surface Laptop Go 2 seems to have the same SAM client devices as the
+Surface Laptop Go 1, so re-use its node group.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ drivers/platform/surface/surface_aggregator_registry.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index 4c2f9f789354..49426b6e6b19 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -327,6 +327,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
+ 	/* Surface Laptop Go 1 */
+ 	{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },
+ 
++	/* Surface Laptop Go 2 */
++	{ "MSHW0290", (unsigned long)ssam_node_group_slg1 },
++
+ 	/* Surface Laptop Studio */
+ 	{ "MSHW0123", (unsigned long)ssam_node_group_sls },
+ 
+-- 
+2.37.0
 

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

@@ -1,4 +1,4 @@
-From 5532f1dad5c57b7a9b9c4b1f771e2310121bf37c Mon Sep 17 00:00:00 2001
+From 62d98765c5e7c351aba5ce4b683e2f1a9466aee2 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
@@ -108,9 +108,9 @@ index 08b561f0709d..d7c397bce0f0 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.36.1
+2.37.0
 
-From 6bebe2683013a8b5a4f057de31acf9eee929145a Mon Sep 17 00:00:00 2001
+From f430873310c61a819f30b8f10bd323f6b11828d8 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
@@ -331,5 +331,5 @@ index 000000000000..8b816ed8f35c
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From a3c5180d58854d9848e120550adc0aa30ecda4e6 Mon Sep 17 00:00:00 2001
+From d8738539980e34f3a7e0c7c841cbc1dfcdc1f54c 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
@@ -73,9 +73,9 @@ index 480476121c01..36e1bf7b7a01 100644
  
  /*
 -- 
-2.36.1
+2.37.0
 
-From 3f35c4d75c838c53ed617072c97d4cfc90bd0ad1 Mon Sep 17 00:00:00 2001
+From 7b86d4f2a25b7a0c28ccd1b6e8de50d1be9265d8 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
@@ -145,5 +145,5 @@ index 242fb690dcaf..30eea54dbb47 100644
  
  
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 140acfe556cdc201c97be96664450cb5f9939a72 Mon Sep 17 00:00:00 2001
+From 3c773cb527c91d55abf865a38b79ca48edd8f746 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
@@ -229,9 +229,9 @@ index 6bb3890b0f2c..c28349e90156 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.36.1
+2.37.0
 
-From 80f2d435ea0e1a6e4a35b5431eddae0056feb9b7 Mon Sep 17 00:00:00 2001
+From 1adefdb1aab528ff4f38033707b4336e2a5427f5 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
@@ -529,5 +529,5 @@ index c28349e90156..61142639be26 100644
  	unregister_pm_notifier(&td->pm_notifier);
  	del_timer_sync(&td->release_timer);
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0009-surface-battery.patch

@@ -1,4 +1,4 @@
-From 64f1647cedc1e373f3973783a5d809cb58c3a129 Mon Sep 17 00:00:00 2001
+From b1c92199d7dc489424e84ef7bd34f5aa8cb61af4 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
@@ -79,9 +79,9 @@ index dc208f5f5a1f..306513fec1e1 100644
  		/* Microsoft Surface Go 3 */
  		.callback = battery_notification_delay_quirk,
 -- 
-2.36.1
+2.37.0
 
-From dda7f8f69c6f1fe429700ce215b0732580987254 Mon Sep 17 00:00:00 2001
+From e38d3d9272f97914cc5318b34f28220b5ee9a72a 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
@@ -127,5 +127,5 @@ index c6b27aab9041..48c1c02c69f4 100644
  };
  
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0010-cameras.patch

@@ -1,4 +1,4 @@
-From a5d21e43c002712767694982b3683df3d0d089df Mon Sep 17 00:00:00 2001
+From 769090263aa89f16c60ff3f228515596e3112d77 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
@@ -72,9 +72,9 @@ index 762b61f67e6c..2c0f39a7f2a1 100644
  	 * Do not enumerate devices with enumeration_by_parent flag set as
  	 * they will be enumerated by their respective parents.
 -- 
-2.36.1
+2.37.0
 
-From 15c59d39a6a921d1b8eeb73f880692c9b3bda5ed Mon Sep 17 00:00:00 2001
+From 96e4c08109113dac5d15cd9d0554691faf69814a 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
@@ -189,9 +189,9 @@ index 5f18ec206696..2b31e531f510 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  
 -- 
-2.36.1
+2.37.0
 
-From cc8e5bd990b10d79b2eeb5d1b1caee22609de840 Mon Sep 17 00:00:00 2001
+From 461ecec0014b5d83ae11b627f152453137ab8f86 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
@@ -226,9 +226,9 @@ index 22f61b47f9e5..e1de1ff40bba 100644
  
  	return 0;
 -- 
-2.36.1
+2.37.0
 
-From 817b85d052e9bb54173f3b6a41a356fc92d96999 Mon Sep 17 00:00:00 2001
+From 0605ceccdfea93beb92a17a0f745e8db206fd050 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
@@ -732,9 +732,9 @@ index 000000000000..8451c75b696b
 +MODULE_DESCRIPTION("DW9719 VCM Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.36.1
+2.37.0
 
-From 384fa044ee092dc482a260cb74a3682a049a0c46 Mon Sep 17 00:00:00 2001
+From 52f3587b1a4dc3233b83e10f7804c33d07b28426 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
@@ -767,9 +767,9 @@ index 8ab0913d8d82..a8631f74dcee 100644
  	if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
  		link_top(graph) = link_top(graph)->next;
 -- 
-2.36.1
+2.37.0
 
-From cb6cd9c93a637d9deaac244a5b614f63e46bf18f Mon Sep 17 00:00:00 2001
+From fde7c3363d92db978e4d37a8191db79c30ef5e1f 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
@@ -851,9 +851,9 @@ index 200fa8462b90..afbae7213d35 100644
  struct media_link_desc {
  	struct media_pad_desc source;
 -- 
-2.36.1
+2.37.0
 
-From b22119fc56c1349cec89d48dccf91073cc15d544 Mon Sep 17 00:00:00 2001
+From bfd5eea69849bbf1552ab23077b7e0d385e31fc2 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
@@ -906,9 +906,9 @@ index a8631f74dcee..4bd80ce1a33d 100644
  			media_id(link->gobj1));
  		break;
 -- 
-2.36.1
+2.37.0
 
-From bf7ae9d37c3c7a7aa6fc6dc016f800bfb36cad83 Mon Sep 17 00:00:00 2001
+From c8119091e44b516b63d65b34af779828e5d1d4ee 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
@@ -983,9 +983,9 @@ index 742918962d46..1d13b8939a11 100644
 +
  #endif
 -- 
-2.36.1
+2.37.0
 
-From da03b2b01ae433ecb17f70be7ef74edf41e75d84 Mon Sep 17 00:00:00 2001
+From 7bbfd78513ac61cef0d3bfd0bf65b08b1ed5ae76 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
@@ -1056,9 +1056,9 @@ index 0404267f1ae4..436bd6900fd8 100644
  	list_del(&asd->list);
  	sd->asd = asd;
 -- 
-2.36.1
+2.37.0
 
-From 1a50f884f0389f48fbb9df3af456e70f9066e28d Mon Sep 17 00:00:00 2001
+From ff95fb2b8614d3bae3560102b94935b36c696447 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
@@ -1171,9 +1171,9 @@ index 0e9b0503b62a..50682a7b2a07 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.36.1
+2.37.0
 
-From ccc823af1be738cef4a6bc903080e2f9550ad571 Mon Sep 17 00:00:00 2001
+From 5d2e20224115bd3ab28e68bc6cf8d2fb134cd575 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
@@ -1214,5 +1214,5 @@ index 50682a7b2a07..ff79582a583d 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.36.1
+2.37.0
 

patches/5.18/0011-amd-gpio.patch

@@ -1,4 +1,4 @@
-From d6a2a4a0eeb738d7c0a7f8f94348aeb7ffcbf113 Mon Sep 17 00:00:00 2001
+From eedfc164c888b18400a679d62147466eaa0327e6 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
@@ -63,9 +63,9 @@ index 0d01e7f5078c..2b06cf5f2b1f 100644
  	mp_config_acpi_legacy_irqs();
  
 -- 
-2.36.1
+2.37.0
 
-From ffe49c73fdcb6cef7323cd6218568f22278944bc Mon Sep 17 00:00:00 2001
+From baf934e4edf5f44d1f79030e8049db411bef0b5f 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
@@ -105,5 +105,5 @@ index 2b06cf5f2b1f..caaec200bea2 100644
  };
  
 -- 
-2.36.1
+2.37.0