Update v5.18 patches

Changes:
 - Add GPE for lid-wakeup on Surface Laptop 4 (Intel 13")
 - Fix Kconfig dependencies in DW9719
 - Rebase onto v5.18.12

Links:
 - kernel: 2de76eee3b

patches/5.18/0001-platform-surface-tabletsw-Fix-__le32-integer-access.patch

@@ -0,0 +1,40 @@
+From ec67d8f1941054e7c9933c2525afa2af2d8289ec Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 17 Jul 2022 13:59:01 +0200
+Subject: [PATCH] platform/surface: tabletsw: Fix __le32 integer access
+
+The sources.count field is a __le32 inside a packed struct. So use the
+proper functions to access it.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Fixes: 9f794056db5b ("platform/surface: Add KIP/POS tablet-mode switch driver")
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+---
+ drivers/platform/surface/surface_aggregator_tabletsw.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
+index 596ca6c80681..27d95a6a7851 100644
+--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
++++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
+@@ -410,7 +410,7 @@ static int ssam_pos_get_source(struct ssam_tablet_sw *sw, u32 *source_id)
+ 	if (status)
+ 		return status;
+ 
+-	if (sources.count == 0) {
++	if (get_unaligned_le32(&sources.count) == 0) {
+ 		dev_err(&sw->sdev->dev, "no posture sources found\n");
+ 		return -ENODEV;
+ 	}
+@@ -422,7 +422,7 @@ static int ssam_pos_get_source(struct ssam_tablet_sw *sw, u32 *source_id)
+ 	 * is a device that provides multiple sources, at which point we can
+ 	 * then try to figure out how to handle them.
+ 	 */
+-	WARN_ON(sources.count > 1);
++	WARN_ON(get_unaligned_le32(&sources.count) > 1);
+ 
+ 	*source_id = get_unaligned_le32(&sources.id[0]);
+ 	return 0;
+-- 
+2.37.0
+

patches/5.18/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 2f31dbd1b48562216054ef8b1a86eb4d4a0d00fa Mon Sep 17 00:00:00 2001
+From cf741ca2484825a3a93fb462906f90a29610c4b8 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.37.0
+2.37.1
 

patches/5.18/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 8f41f0d8d8524f49715b2a4260a7c69b0004be98 Mon Sep 17 00:00:00 2001
+From abff27bc648f9b07ce93c1fe741ba14d527ecaab 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.37.0
+2.37.1
 
-From 49e85ca2bd9553306dd608c414bcbefc8518b6f6 Mon Sep 17 00:00:00 2001
+From d7f05f00aaaaf048a9120d9a651668e91431aea7 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.37.0
+2.37.1
 
-From 3a96594c6e3303cfbc7bcd5302e37aa715009fd7 Mon Sep 17 00:00:00 2001
+From 9933dbdafbd7eb0aeee96db70f8bb125649a6f64 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.37.0
+2.37.1
 
-From a8889fe482cf58bce1b2b7f32e217ede837146e4 Mon Sep 17 00:00:00 2001
+From d3f32630c325e5d0c475ba7bf2799f894542fcad 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.37.0
+2.37.1
 
-From 8bd0256f221315e7a59bdd44477f687a8d66825b Mon Sep 17 00:00:00 2001
+From f5bd6252dccb38515dfdb214681d03367bd2461b 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.37.0
+2.37.1
 
-From 503be5cfd84eebc5cb211f1cfa793117bcd82c21 Mon Sep 17 00:00:00 2001
+From 6df035f091e9d45a28c1252626de137876483e48 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.37.0
+2.37.1
 

patches/5.18/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From 6a2d820af848cd7c0d33d7569feabac22eb66aaa Mon Sep 17 00:00:00 2001
+From 8d6c2209dc2eeecab1366251c5cbe34f990c9073 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.37.0
+2.37.1
 

patches/5.18/0004-ipts.patch

@@ -1,4 +1,4 @@
-From dc38cdd24db6cb132630937b272c1afbb9586a12 Mon Sep 17 00:00:00 2001
+From 4fccc77c32cdad672ccc1d18802380e3352f53c7 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.37.0
+2.37.1
 
-From fefd8fb7eb538337f4093ccc1cd933853014ee43 Mon Sep 17 00:00:00 2001
+From 6936c74d03686b979c9d4f48d97c0cfd21aa2aeb 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.37.0
+2.37.1
 
-From 9b702ebe3888ad5b6219f2810d9e66dbe0d457dd Mon Sep 17 00:00:00 2001
+From f9dccbe3576b2547dacbb07bf4c996782ad53485 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 ba9a63cac47c..5f18ec206696 100644
+index c7ec5177cf78..7f3699e19270 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,8 @@
@@ -1550,7 +1550,7 @@ index ba9a63cac47c..5f18ec206696 100644
  
  int intel_iommu_gfx_mapped;
  EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
-@@ -2724,6 +2728,9 @@ static int device_def_domain_type(struct device *dev)
+@@ -2700,6 +2704,9 @@ static int device_def_domain_type(struct device *dev)
  
  		if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
@@ -1560,7 +1560,7 @@ index ba9a63cac47c..5f18ec206696 100644
  	}
  
  	return 0;
-@@ -3160,6 +3167,9 @@ static int __init init_dmars(void)
+@@ -3136,6 +3143,9 @@ static int __init init_dmars(void)
  	if (!dmar_map_gfx)
  		iommu_identity_mapping |= IDENTMAP_GFX;
  
@@ -1570,7 +1570,7 @@ index ba9a63cac47c..5f18ec206696 100644
  	check_tylersburg_isoch();
  
  	ret = si_domain_init(hw_pass_through);
-@@ -4931,6 +4941,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
+@@ -4907,6 +4917,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
  	dmar_map_gfx = 0;
  }
  
@@ -1588,7 +1588,7 @@ index ba9a63cac47c..5f18ec206696 100644
  /* G4x/GM45 integrated gfx dmar support is totally busted. */
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
-@@ -4966,6 +4987,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+@@ -4942,6 +4963,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
  
@@ -1599,5 +1599,5 @@ index ba9a63cac47c..5f18ec206696 100644
  {
  	if (risky_device(dev))
 -- 
-2.37.0
+2.37.1
 

patches/5.18/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From 8575bb94f1450854affff41dda90f3447f3e6d7e Mon Sep 17 00:00:00 2001
+From 550e9ddd3b392c9f68f44d76a2389cd43b784be7 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.37.0
+2.37.1
 
-From d53d39de61921867c7e8bb91a4fec35efec2a9bf Mon Sep 17 00:00:00 2001
+From dcebf1c01c122ea59e8755712d435bdb70459819 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.37.0
+2.37.1
 
-From e53a3d2dc2521fd23412d0589c3cc46c147ab40a Mon Sep 17 00:00:00 2001
+From 7d277f113216bcd0d58aecd2dad749c4c887e2af 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.37.0
+2.37.1
 
-From 3b0c00c9b1e64794a2b90c1215e914f309cdb845 Mon Sep 17 00:00:00 2001
+From abc567f5b48f5c5e4411db95e77e65969e35dd56 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.37.0
+2.37.1
 
-From 36d1b2b993b2af9d78570d7e5a9af82646578ece Mon Sep 17 00:00:00 2001
+From 7f9680eff8a14d2919a3a3e84ab9eee8818af657 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.37.0
+2.37.1
 
-From c57bb9199f41c3da8ea02917184b53e8811df903 Mon Sep 17 00:00:00 2001
+From 7feb7278c04c33413982b0db59739f7156628d23 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.37.0
+2.37.1
 
-From 74f87013db2410c520bda85d3aff6b9dcfe4103e Mon Sep 17 00:00:00 2001
+From 60d0ce1ac47b4b67ecc0959df26e486bde131787 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.37.0
+2.37.1
 
-From fec69423f43d25fca0e1c8fb41b1bc20e0c9dc58 Mon Sep 17 00:00:00 2001
+From 396d4a15f481051f8c1166cb8f6eb47866d17059 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.37.0
+2.37.1
 
-From 57004767b41ec99bfc16fbc5c760eca8737195a3 Mon Sep 17 00:00:00 2001
+From 40e2b1e2f5d8a278ba54956afce0e86965d4e27d 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.37.0
+2.37.1
 
-From 963d896d5d309e2509e4375512f33ff263d6b05a Mon Sep 17 00:00:00 2001
+From d0a0d4a20b9f8c088e40011e3698c8482261da58 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.37.0
+2.37.1
 
-From 87e0ff3e78b15a80437535cb414dab2c5b3bae0f Mon Sep 17 00:00:00 2001
+From 86191fe4282251c880e75e5a46314e74da4b3893 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.37.0
+2.37.1
 
-From 603cb57938adc264a2fbc01ff8e3ba3c87c92df7 Mon Sep 17 00:00:00 2001
+From b25bc4f80dbae8d5df28c5ef441a82433a0748ca 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.37.0
+2.37.1
 
-From de303dea3582c1ad2837b1c91fc68a7435bc5936 Mon Sep 17 00:00:00 2001
+From 43ce03c9b3699ae762becc3fe9526ee539c19eae 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.37.0
+2.37.1
 
-From c7c779e355c053b5891a20ff780bc46d6a750bda Mon Sep 17 00:00:00 2001
+From fdcb77c3f66ebd46e6eb95a9322d7f6f4ed1f780 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.37.0
+2.37.1
 
-From 95b9bc1ecbe8012833fb0a1f697589c137bec4bf Mon Sep 17 00:00:00 2001
+From fcb511a2079e6b3c9195d854240d8f3f74400b8a 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
@@ -1914,10 +1914,10 @@ Patchset: surface-sam
  create mode 100644 drivers/platform/surface/surface_aggregator_tabletsw.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 8e6622ed6de6..a29e66214dcb 100644
+index 2b70e2d21405..cad9449b37e1 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13043,6 +13043,12 @@ F:	drivers/scsi/smartpqi/smartpqi*.[ch]
+@@ -13035,6 +13035,12 @@ F:	drivers/scsi/smartpqi/smartpqi*.[ch]
  F:	include/linux/cciss*.h
  F:	include/uapi/linux/cciss*.h
  
@@ -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.37.0
+2.37.1
 
-From d8176591cd782254b02e29c323f5a63298d55e9f Mon Sep 17 00:00:00 2001
+From 5d9cf1527cde9b1905e1461f7578dc3316542540 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.37.0
+2.37.1
 
-From ac503280722194dabbb49bd4eee10ab69d37e2a0 Mon Sep 17 00:00:00 2001
+From bb4a2867094ec4ad9e6359e62d8b52d88b22e5f5 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.37.0
+2.37.1
 
-From 7da546f4e9c9a1187fbec67d3ce9c356004cd5c4 Mon Sep 17 00:00:00 2001
+From 215e4ff7cd02642af7658044a62f5a19ffce6b99 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.37.0
+2.37.1
 
-From ea96cc9c29566b5d5a7299714d5bf6d27652aec4 Mon Sep 17 00:00:00 2001
+From f552275d37cb1d424577f4f7f9faa333812fe46e 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
@@ -3027,10 +3027,10 @@ Patchset: surface-sam
  create mode 100644 drivers/platform/surface/surface_aggregator_hub.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index a29e66214dcb..1f1625c0ac35 100644
+index cad9449b37e1..26bc8bf48b7b 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13120,6 +13120,12 @@ F:	include/linux/surface_acpi_notify.h
+@@ -13112,6 +13112,12 @@ F:	include/linux/surface_acpi_notify.h
  F:	include/linux/surface_aggregator/
  F:	include/uapi/linux/surface_aggregator/
  
@@ -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.37.0
+2.37.1
 
-From 1cd297008ac04afb8048a59180367132b1872809 Mon Sep 17 00:00:00 2001
+From cac3001244920fa5beb2b351cd2ce0444270aa47 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,9 +4207,9 @@ index 6373d3b5eb7f..fbf2e11fd6ce 100644
  
  #include <asm/unaligned.h>
 -- 
-2.37.0
+2.37.1
 
-From a1a10d9c00a1ca3b26a6bb0b69dcb9b4a7b71e49 Mon Sep 17 00:00:00 2001
+From f572a9241a4c0460790aa66fdb7e65640fdedb44 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: aggregator_registry: Rename HID device
@@ -4280,9 +4280,9 @@ index d5655f6a4a41..b325fa0c5ee0 100644
  };
  
 -- 
-2.37.0
+2.37.1
 
-From 044783aea90f68116089b663b78cea4188b03d11 Mon Sep 17 00:00:00 2001
+From a781304d47cb8979b265e1e249679f0b64560333 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: aggregator_registry: Rename HID device
@@ -4373,9 +4373,9 @@ index b325fa0c5ee0..3aa825b5aa26 100644
  };
  
 -- 
-2.37.0
+2.37.1
 
-From cb1691f10db3a1f3080694022793db55a7b17d21 Mon Sep 17 00:00:00 2001
+From 498e47f335f84d52e81fdd22eb88fe3a20412911 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: aggregator_registry: Add HID devices for
@@ -4409,9 +4409,9 @@ index 3aa825b5aa26..4c2f9f789354 100644
  };
  
 -- 
-2.37.0
+2.37.1
 
-From 373b9c954a5e1ded460af61e528617d8101e5eae Mon Sep 17 00:00:00 2001
+From 5b47be651293a9f40dcc47078b66925d902bcf06 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
@@ -4441,5 +4441,5 @@ index 4c2f9f789354..49426b6e6b19 100644
  	{ "MSHW0123", (unsigned long)ssam_node_group_sls },
  
 -- 
-2.37.0
+2.37.1
 

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

@@ -1,4 +1,4 @@
-From 62d98765c5e7c351aba5ce4b683e2f1a9466aee2 Mon Sep 17 00:00:00 2001
+From 31c9f1ade07e8c0ac6bd87f94c9708b3132811e7 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.37.0
+2.37.1
 
-From f430873310c61a819f30b8f10bd323f6b11828d8 Mon Sep 17 00:00:00 2001
+From 4f2fb44440adf7e797a1f5b24c6cc79e6f2cc6ab 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.37.0
+2.37.1
 

patches/5.18/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From d8738539980e34f3a7e0c7c841cbc1dfcdc1f54c Mon Sep 17 00:00:00 2001
+From 67348f42bd65c0a503f17c385bb8d671d8e9515a 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.37.0
+2.37.1
 
-From 7b86d4f2a25b7a0c28ccd1b6e8de50d1be9265d8 Mon Sep 17 00:00:00 2001
+From f024f0723fc9dc3989624e005cc51807d7b6161d 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.37.0
+2.37.1
 

patches/5.18/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 3c773cb527c91d55abf865a38b79ca48edd8f746 Mon Sep 17 00:00:00 2001
+From 8087f821849bb271f0946c6a451fe913c05df5dd 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.37.0
+2.37.1
 
-From 1adefdb1aab528ff4f38033707b4336e2a5427f5 Mon Sep 17 00:00:00 2001
+From 7ef077badbe7747a8480438b85a1b6ba7f481b88 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.37.0
+2.37.1
 

patches/5.18/0009-surface-battery.patch

@@ -1,4 +1,4 @@
-From b1c92199d7dc489424e84ef7bd34f5aa8cb61af4 Mon Sep 17 00:00:00 2001
+From b055ddb487a02d9afa19f9db3530e4c960fc7a4c 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.37.0
+2.37.1
 
-From e38d3d9272f97914cc5318b34f28220b5ee9a72a Mon Sep 17 00:00:00 2001
+From e987adeb38d866b4cb3fac254f693915cd7d6179 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.37.0
+2.37.1
 

patches/5.18/0010-surface-gpe.patch

@@ -0,0 +1,41 @@
+From 9dbb948b83555306a3a2846374a0ac5521130a74 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Thu, 21 Jul 2022 02:15:50 +0200
+Subject: [PATCH] platform/surface: gpe: Add support for 13" Intel version of
+ Surface Laptop 4
+
+The 13" Intel version of the Surface Laptop 4 uses the same GPE as the
+Surface Laptop Studio for wakeups via the lid. Set it up accordingly.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-gpe
+---
+ drivers/platform/surface/surface_gpe.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
+index 27365cbe1ee9..c219b840d491 100644
+--- a/drivers/platform/surface/surface_gpe.c
++++ b/drivers/platform/surface/surface_gpe.c
+@@ -171,6 +171,18 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
+ 		},
+ 		.driver_data = (void *)lid_device_props_l4D,
+ 	},
++	{
++		.ident = "Surface Laptop 4 (Intel 13\")",
++		.matches = {
++			/*
++			 * We match for SKU here due to different variants: The
++			 * AMD (15") version does not rely on GPEs.
++			 */
++			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
++			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1950:1951"),
++		},
++		.driver_data = (void *)lid_device_props_l4B,
++	},
+ 	{
+ 		.ident = "Surface Laptop Studio",
+ 		.matches = {
+-- 
+2.37.1
+

patches/5.18/0011-cameras.patch

@@ -1,4 +1,4 @@
-From 769090263aa89f16c60ff3f228515596e3112d77 Mon Sep 17 00:00:00 2001
+From 83c739bec295bc9798a5935a729b91883b32ea98 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.37.0
+2.37.1
 
-From 96e4c08109113dac5d15cd9d0554691faf69814a Mon Sep 17 00:00:00 2001
+From 420070f2886d69fe3a758791bb9d17c348444432 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 5f18ec206696..2b31e531f510 100644
+index 7f3699e19270..0ee615daadeb 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,12 @@
@@ -131,7 +131,7 @@ index 5f18ec206696..2b31e531f510 100644
  #define IDENTMAP_IPTS		16
  
  int intel_iommu_gfx_mapped;
-@@ -2729,6 +2737,9 @@ static int device_def_domain_type(struct device *dev)
+@@ -2705,6 +2713,9 @@ static int device_def_domain_type(struct device *dev)
  		if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
  
@@ -141,7 +141,7 @@ index 5f18ec206696..2b31e531f510 100644
  		if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
  	}
-@@ -3167,6 +3178,9 @@ static int __init init_dmars(void)
+@@ -3143,6 +3154,9 @@ static int __init init_dmars(void)
  	if (!dmar_map_gfx)
  		iommu_identity_mapping |= IDENTMAP_GFX;
  
@@ -151,7 +151,7 @@ index 5f18ec206696..2b31e531f510 100644
  	if (!dmar_map_ipts)
  		iommu_identity_mapping |= IDENTMAP_IPTS;
  
-@@ -4941,6 +4955,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
+@@ -4917,6 +4931,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
  	dmar_map_gfx = 0;
  }
  
@@ -170,7 +170,7 @@ index 5f18ec206696..2b31e531f510 100644
  static void quirk_iommu_ipts(struct pci_dev *dev)
  {
  	if (!IS_IPTS(dev))
-@@ -4952,6 +4978,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
+@@ -4928,6 +4954,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
  	pci_info(dev, "Passthrough IOMMU for IPTS\n");
  	dmar_map_ipts = 0;
  }
@@ -178,7 +178,7 @@ index 5f18ec206696..2b31e531f510 100644
  /* G4x/GM45 integrated gfx dmar support is totally busted. */
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
-@@ -4987,6 +5014,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+@@ -4963,6 +4990,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
  
@@ -189,9 +189,9 @@ index 5f18ec206696..2b31e531f510 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  
 -- 
-2.37.0
+2.37.1
 
-From 461ecec0014b5d83ae11b627f152453137ab8f86 Mon Sep 17 00:00:00 2001
+From ac3f64d2b87ab11288d536e37e42c25b894c68fa 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.37.0
+2.37.1
 
-From 0605ceccdfea93beb92a17a0f745e8db206fd050 Mon Sep 17 00:00:00 2001
+From c4dff89995c92d098a7f4b1a457e85ea87f417cc 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
@@ -247,10 +247,10 @@ Patchset: cameras
  create mode 100644 drivers/media/i2c/dw9719.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1f1625c0ac35..a34034a81926 100644
+index 26bc8bf48b7b..a5d382fca868 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -6006,6 +6006,13 @@ T:	git git://linuxtv.org/media_tree.git
+@@ -6002,6 +6002,13 @@ T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt
  F:	drivers/media/i2c/dw9714.c
  
@@ -732,9 +732,38 @@ index 000000000000..8451c75b696b
 +MODULE_DESCRIPTION("DW9719 VCM Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.37.0
+2.37.1
 
-From 52f3587b1a4dc3233b83e10f7804c33d07b28426 Mon Sep 17 00:00:00 2001
+From 51287063af97bd385b6606483f2d805c44923a65 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Fri, 15 Jul 2022 23:48:00 +0200
+Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
+
+It should depend on VIDEO_DEV instead of VIDEO_V4L2.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: cameras
+---
+ drivers/media/i2c/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
+index 49d1c59334e3..d3f27554a1e3 100644
+--- a/drivers/media/i2c/Kconfig
++++ b/drivers/media/i2c/Kconfig
+@@ -808,7 +808,7 @@ config VIDEO_DW9714
+ 
+ config VIDEO_DW9719
+ 	tristate "DW9719 lens voice coil support"
+-	depends on I2C && VIDEO_V4L2
++	depends on I2C && VIDEO_DEV
+ 	select MEDIA_CONTROLLER
+ 	select VIDEO_V4L2_SUBDEV_API
+ 	select V4L2_ASYNC
+-- 
+2.37.1
+
+From b764bc9c859d34292cda94163cb2cb2d4761c413 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 +796,9 @@ index 8ab0913d8d82..a8631f74dcee 100644
  	if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
  		link_top(graph) = link_top(graph)->next;
 -- 
-2.37.0
+2.37.1
 
-From fde7c3363d92db978e4d37a8191db79c30ef5e1f Mon Sep 17 00:00:00 2001
+From 2550a923d8c8b22d70539ce9f3d6a5bbc67d8e5e 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 +880,9 @@ index 200fa8462b90..afbae7213d35 100644
  struct media_link_desc {
  	struct media_pad_desc source;
 -- 
-2.37.0
+2.37.1
 
-From bfd5eea69849bbf1552ab23077b7e0d385e31fc2 Mon Sep 17 00:00:00 2001
+From d3a6d0b7d8a213ebebf92581f6c4d88983baa90b 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 +935,9 @@ index a8631f74dcee..4bd80ce1a33d 100644
  			media_id(link->gobj1));
  		break;
 -- 
-2.37.0
+2.37.1
 
-From c8119091e44b516b63d65b34af779828e5d1d4ee Mon Sep 17 00:00:00 2001
+From ee5d85600e031b42dc570eacf6284bc94c087ab1 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 +1012,9 @@ index 742918962d46..1d13b8939a11 100644
 +
  #endif
 -- 
-2.37.0
+2.37.1
 
-From 7bbfd78513ac61cef0d3bfd0bf65b08b1ed5ae76 Mon Sep 17 00:00:00 2001
+From 3392785a3ff8c08bb7115c1c02557687b5be10aa 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 +1085,9 @@ index 0404267f1ae4..436bd6900fd8 100644
  	list_del(&asd->list);
  	sd->asd = asd;
 -- 
-2.37.0
+2.37.1
 
-From ff95fb2b8614d3bae3560102b94935b36c696447 Mon Sep 17 00:00:00 2001
+From 5676fe1fb34f303eb78160f321b5a9d7f9590aeb 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 +1200,9 @@ index 0e9b0503b62a..50682a7b2a07 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.37.0
+2.37.1
 
-From 5d2e20224115bd3ab28e68bc6cf8d2fb134cd575 Mon Sep 17 00:00:00 2001
+From 637ce5d60a1dba5fb9a015e339769409b83a484b 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 +1243,5 @@ index 50682a7b2a07..ff79582a583d 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.37.0
+2.37.1
 

patches/5.18/0012-amd-gpio.patch

@@ -1,4 +1,4 @@
-From eedfc164c888b18400a679d62147466eaa0327e6 Mon Sep 17 00:00:00 2001
+From 42dfe1de1eb980996acbfb0cce445504aaad685f 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.37.0
+2.37.1
 
-From baf934e4edf5f44d1f79030e8049db411bef0b5f Mon Sep 17 00:00:00 2001
+From 6042844db798e5f52c2c9e4ec32dd875bb10127b 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.37.0
+2.37.1
 

pkg/arch/kernel/0001-platform-surface-tabletsw-Fix-__le32-integer-access.patch

@@ -0,0 +1 @@
+../../../patches/5.18/0001-platform-surface-tabletsw-Fix-__le32-integer-access.patch

pkg/arch/kernel/0010-cameras.patch

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

pkg/arch/kernel/0010-surface-gpe.patch

@@ -0,0 +1 @@
+../../../patches/5.18/0010-surface-gpe.patch

pkg/arch/kernel/0011-amd-gpio.patch

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

pkg/arch/kernel/0011-cameras.patch

@@ -0,0 +1 @@
+../../../patches/5.18/0011-cameras.patch

pkg/arch/kernel/0012-amd-gpio.patch

@@ -0,0 +1 @@
+../../../patches/5.18/0012-amd-gpio.patch

pkg/arch/kernel/PKGBUILD

@@ -38,8 +38,9 @@ source=(
   0007-surface-button.patch
   0008-surface-typecover.patch
   0009-surface-battery.patch
-  0010-cameras.patch
-  0011-amd-gpio.patch
+  0010-surface-gpe.patch
+  0011-cameras.patch
+  0012-amd-gpio.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -50,17 +51,18 @@ sha256sums=('SKIP'
             '533d32e1f6c33f7f390796af18dc3dca0a6aa294f8e9340600cd86c8df65e25b'
             'b261a70fa7d6799328c926b2603b17336b76adb313eb4374c6cb06716caa9fe6'
             '22902a3ac84f3ae0a8b442a99c63f81ce8f2dfd678c7c66420fffd52110f11d9'
-            '60699614d4a7eb98b25b42bf3d4cbf82bff4ddb93052b74002112986d34b4b2e'
-            '3adbb3370fb00e86dc6073079e0fe8616521cec37bf7c674a1fe0aea522b9ab9'
-            '6cc7e49aead909faae29ed320f7e932579c824f573bc669fbda1e0d7cb603955'
-            '26a95d09ddbf4b9cbf9764c9ef0b3ab7e5db9aee1b83a751262410fe03d49bb9'
-            'ecbf78ae99bacb1ca3d0506069045f4539e4cf5e9330d1056e4ad676c0623a57'
-            '274e0b1470a2b55d90402d6af355cc9a292745317e54b249dd858e7ede1673f7'
-            '094da5ba1981472a0c2ba78b101a0912e8dfa1422a26fac9f6ee7c5131946c73'
-            'f3b9993c5e65aaa7d42d763304d09fbc1159be6dcf5856d557b2bb84af4c40ef'
-            'eef248901185f01973079f7e257e6dce2cf25e4f346896cbdd0080fe7766ed4f'
-            '6fceded21afc267dfcaf004e11ae19393aea2251552af1c6d742aac147401ab1'
-            'daebc9539c8f52e167d5dbb161caac42d1a62c80906edaa7225a4007c61c5dc5')
+            'cc705698544accd4b37afbbabe64f4b28ba0db586d18b806fa57303e3c4c45b1'
+            '99fb797853eacb37df613e4286cd110ed918332f7a80a743d792daf42412fa0a'
+            'b0b43aac316827f8b8430c0cf686a49a177be4b716ef2d36b97ddaa0f2caefc8'
+            '4ffb6c15905f3c980e57a139df2af1454c4d1c61c887d603a5175719243b3adf'
+            '1d73cee3afc2e2845143801116bbd3d9eef7470c88f594906cc87ab43f068b1d'
+            '007373eed32454fe84e73b8d9244a52c521f65a2161a7f8a708f8b2f9a572117'
+            '8a5e8ce50e8ecedf61d8c7ad509aab3527a36adb79f05b6492f7d9a32e3d4e13'
+            '862b1afd5e69ce90fcda48cdb10dc1f09fa34a5fc48599d06b5086a9f47e4fa6'
+            'aaf88bde7bf1e49aafa7957f6dc8a869993ac56b1fbe6a1f852a97a41716e119'
+            '4caf51cea87c7f41f3b641b8866e3dcdf82e7977e9ecf16d60262b4cc36835bb'
+            '3a27e121d3c7e1eb963409bb46dfd20169d825dacda2ccf7bdcb8bc420804370'
+            '44350579d80515b562553aebad9c10db15b37d0ff8e6bb4f6947df553782c174')
 
 
 export KBUILD_BUILD_HOST=archlinux