Update v6.0 patches

Changes:
 - Rebase onto v6.0.11

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/abf8ca73772fa8adc463d90a110a0f33e8807c97

patches/6.0/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 8fe671a9f57d800b215042b7a6b602600984a832 Mon Sep 17 00:00:00 2001
+From 4e34f6d1cf11448170750bd8b639855a97124033 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

patches/6.0/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 7e248ed7959e37cc0f03727fea43d2d858e626df Mon Sep 17 00:00:00 2001
+From 648a81a3491bea27c1ae2bb27a564116fe63fd68 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
@@ -165,7 +165,7 @@ index d6ff964aec5b..5d30ae39d65e 100644
 -- 
 2.38.1
 
-From 9845115040a5d1530a6cbc16b22dd25020e1118d Mon Sep 17 00:00:00 2001
+From d2893da8412417f719daa8651cb111edc5c6b911 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

patches/6.0/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From cc982c13e29e049873ab8b64bd661a369f03989b Mon Sep 17 00:00:00 2001
+From bcbcaa2f1d443f6f2b0c98a9c9d4bd88d8cbb7f7 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

patches/6.0/0004-ipts.patch

@@ -1,4 +1,4 @@
-From 8be382c9fd3b73eadc47b91ea58236d656aafaea Mon Sep 17 00:00:00 2001
+From 07ef5872380dac03b1766811bd625e62204ca4dc 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 5435604327a7..1165ee4f5928 100644
 -- 
 2.38.1
 
-From a51712053f361a8b01c6450c400fe945b429a446 Mon Sep 17 00:00:00 2001
+From f5278890b80faf72ef170559a67db00386da299d 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
@@ -1504,7 +1504,7 @@ index 000000000000..53fb86a88f97
 -- 
 2.38.1
 
-From c654d01ea28729ca3dcdd83942dcddcff7d3531b Mon Sep 17 00:00:00 2001
+From c01f8a391df94ee2649e37207581a6d8ff7955eb 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
@@ -1526,7 +1526,7 @@ Patchset: ipts
  1 file changed, 24 insertions(+)
 
 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index ecc0b05b2796..4c895b5f7e2d 100644
+index e47700674978..ad9fda586f5e 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,8 @@
@@ -1553,7 +1553,7 @@ index ecc0b05b2796..4c895b5f7e2d 100644
  
  const struct iommu_ops intel_iommu_ops;
  
-@@ -2603,6 +2607,9 @@ static int device_def_domain_type(struct device *dev)
+@@ -2601,6 +2605,9 @@ static int device_def_domain_type(struct device *dev)
  
  		if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
@@ -1563,7 +1563,7 @@ index ecc0b05b2796..4c895b5f7e2d 100644
  	}
  
  	return 0;
-@@ -2992,6 +2999,9 @@ static int __init init_dmars(void)
+@@ -2990,6 +2997,9 @@ static int __init init_dmars(void)
  	if (!dmar_map_gfx)
  		iommu_identity_mapping |= IDENTMAP_GFX;
  
@@ -1573,7 +1573,7 @@ index ecc0b05b2796..4c895b5f7e2d 100644
  	check_tylersburg_isoch();
  
  	ret = si_domain_init(hw_pass_through);
-@@ -4793,6 +4803,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
+@@ -4791,6 +4801,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
  	dmar_map_gfx = 0;
  }
  
@@ -1591,7 +1591,7 @@ index ecc0b05b2796..4c895b5f7e2d 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);
-@@ -4828,6 +4849,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+@@ -4826,6 +4847,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);
  

patches/6.0/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From b904ea6343ad35542dd2c77da8f9e9cef0f93737 Mon Sep 17 00:00:00 2001
+From c551c8c87815fc368360086fd4210d9240ea8007 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:23:53 +0100
 Subject: [PATCH] platform/surface: aggregator: Improve documentation and
@@ -261,7 +261,7 @@ index 45501b6e54e8..5c4ae1a26183 100644
 -- 
 2.38.1
 
-From e69504d11228b8c277ec13dabb2cdbf638bd2818 Mon Sep 17 00:00:00 2001
+From 7f6fee1201df8ad9226b4de906c251598ea1e828 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:30:58 +0100
 Subject: [PATCH] platform/surface: aggregator: Ignore command messages not
@@ -334,7 +334,7 @@ index f5565570f16c..90634dcacabf 100644
 -- 
 2.38.1
 
-From febd0871501c2caf6b7e5a156b9d8218a9a69926 Mon Sep 17 00:00:00 2001
+From 61e2663e29a78ca0f60c5ba4a99ddd7761a5b7e5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:42:19 +0100
 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
@@ -528,7 +528,7 @@ index 2a2c17771d01..55cc61bba1da 100644
 -- 
 2.38.1
 
-From bb3a83ac2d4e4a7151a16a5ca4760b8031195c01 Mon Sep 17 00:00:00 2001
+From 808a6cbe64c6d5a8385c400ab37da4451a3377da Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:32:16 +0100
 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
@@ -568,7 +568,7 @@ index 43061514be38..62f27cdb6ca8 100644
 -- 
 2.38.1
 
-From 347e72d74f926a14dd32b98d50ed9089772dabfb Mon Sep 17 00:00:00 2001
+From 70a966b9dccbe5832648f486eddd8a2e9808033b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:33:26 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
@@ -617,7 +617,7 @@ index 27d95a6a7851..bd8cd453c393 100644
 -- 
 2.38.1
 
-From 84f9a75cd7e51ee52860e620958d811abafe79fc Mon Sep 17 00:00:00 2001
+From 132d5c0de71d25479d11387696d771570438ae6e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:34:06 +0100
 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
@@ -712,7 +712,7 @@ index ed36944467f9..0de76a784a35 100644
 -- 
 2.38.1
 
-From cdcf418132286d93f4cec1cc25c07afb4a2d8556 Mon Sep 17 00:00:00 2001
+From f010e6760bdfcf0224b0c8fd1a7855fa5d64c1ac Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:40:06 +0100
 Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding
@@ -743,7 +743,7 @@ index 0635341bc517..42933bf3e925 100644
 -- 
 2.38.1
 
-From ae02e8a46ec56484c66edddfb8e36dfef8f53754 Mon Sep 17 00:00:00 2001
+From 41453dfba5bc6ab19769fdda663d3b8f1172b1ae Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:45:28 +0100
 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
@@ -975,7 +975,7 @@ index 46c45d1b6368..4da20b7a0ee5 100644
 -- 
 2.38.1
 
-From 9667473df15e2d92e28ccc2274156df4d70b921b Mon Sep 17 00:00:00 2001
+From 9da775f8454ca4370a2d259d40cee2b10558603d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:46:37 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
@@ -1007,7 +1007,7 @@ index 6abd1efe2088..8b8b80228c14 100644
  };
  MODULE_DEVICE_TABLE(ssam, ssam_hub_match);
 diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index 585911020cea..3afe293ac114 100644
+index 023f126121d7..296f72d52e6a 100644
 --- a/drivers/platform/surface/surface_aggregator_registry.c
 +++ b/drivers/platform/surface/surface_aggregator_registry.c
 @@ -46,7 +46,7 @@ static const struct software_node ssam_node_hub_kip = {
@@ -1022,224 +1022,3 @@ index 585911020cea..3afe293ac114 100644
 -- 
 2.38.1
 
-From c151978f37d212f78d6776dfcdff5bfde2b48d98 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Wed, 9 Nov 2022 13:13:12 +0100
-Subject: [PATCH] wip! platform/surface: aggregator_registry: Add preliminary
- support for Surface Pro 9
-
-Adds support for battery and charger status, as well as platform profile
-and internal HID devices. Support for type-cover HID devices is still
-missing, requiring validation.
-
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
-Patchset: surface-sam
----
- .../surface/surface_aggregator_registry.c       | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index 3afe293ac114..443fe7647315 100644
---- a/drivers/platform/surface/surface_aggregator_registry.c
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
-@@ -268,6 +268,7 @@ static const struct software_node *ssam_node_group_sp7[] = {
- 	NULL,
- };
- 
-+/* Devices for Surface Pro 8 */
- static const struct software_node *ssam_node_group_sp8[] = {
- 	&ssam_node_root,
- 	&ssam_node_hub_kip,
-@@ -284,6 +285,19 @@ static const struct software_node *ssam_node_group_sp8[] = {
- 	NULL,
- };
- 
-+/* Devices for Surface Pro 9 */
-+static const struct software_node *ssam_node_group_sp9[] = {
-+	&ssam_node_root,
-+	&ssam_node_hub_kip,
-+	&ssam_node_bat_ac,
-+	&ssam_node_bat_main,
-+	&ssam_node_tmp_pprof,
-+	/* TODO: typecover/KIP devices, we can likely reuse the SP8 node but need validation */
-+	&ssam_node_hid_sam_sensors,
-+	&ssam_node_hid_sam_ucm_ucsi,
-+	NULL,
-+};
-+
- 
- /* -- SSAM platform/meta-hub driver. ---------------------------------------- */
- 
-@@ -303,6 +317,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
- 	/* Surface Pro 8 */
- 	{ "MSHW0263", (unsigned long)ssam_node_group_sp8 },
- 
-+	/* Surface Pro 9 */
-+	{ "MSHW0343", (unsigned long)ssam_node_group_sp9 },
-+
- 	/* Surface Book 2 */
- 	{ "MSHW0107", (unsigned long)ssam_node_group_gen5 },
- 
--- 
-2.38.1
-
-From 6a846887034568d75966664d6a260fb1f9f70da5 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Sat, 12 Nov 2022 22:51:26 +0100
-Subject: [PATCH] wip! platform/surface: aggregator_registry: Add preliminary
- typecover support for Surface Pro 9
-
-Still missing: Tablet mode switch.
-
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
-Patchset: surface-sam
----
- drivers/platform/surface/surface_aggregator_registry.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index 443fe7647315..58ad4cad445c 100644
---- a/drivers/platform/surface/surface_aggregator_registry.c
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
-@@ -292,7 +292,11 @@ static const struct software_node *ssam_node_group_sp9[] = {
- 	&ssam_node_bat_ac,
- 	&ssam_node_bat_main,
- 	&ssam_node_tmp_pprof,
--	/* TODO: typecover/KIP devices, we can likely reuse the SP8 node but need validation */
-+	/* TODO: POS tablet mode switch */
-+	&ssam_node_hid_kip_keyboard,
-+	&ssam_node_hid_kip_penstash,
-+	&ssam_node_hid_kip_touchpad,
-+	&ssam_node_hid_kip_fwupd,
- 	&ssam_node_hid_sam_sensors,
- 	&ssam_node_hid_sam_ucm_ucsi,
- 	NULL,
--- 
-2.38.1
-
-From 1ffe56fc2014d26ef730455b4d3956bd4845f521 Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Sun, 13 Nov 2022 11:38:58 +0100
-Subject: [PATCH] wip! platform/surface: aggregator: Do not check for repeated
- unsequenced packets
-
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
-Patchset: surface-sam
----
- .../surface/aggregator/ssh_packet_layer.c     | 25 ++++++++++++++++---
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/platform/surface/aggregator/ssh_packet_layer.c b/drivers/platform/surface/aggregator/ssh_packet_layer.c
-index 6748fe4ac5d5..e0d5b18ade0b 100644
---- a/drivers/platform/surface/aggregator/ssh_packet_layer.c
-+++ b/drivers/platform/surface/aggregator/ssh_packet_layer.c
-@@ -1596,16 +1596,33 @@ static void ssh_ptl_timeout_reap(struct work_struct *work)
- 		ssh_ptl_tx_wakeup_packet(ptl);
- }
- 
--static bool ssh_ptl_rx_retransmit_check(struct ssh_ptl *ptl, u8 seq)
-+static bool ssh_ptl_rx_retransmit_check(struct ssh_ptl *ptl,
-+					const struct ssh_frame *frame)
- {
- 	int i;
- 
-+	/*
-+	 * Ignore unsequenced packets. On some devices (notably Surface Pro 9),
-+	 * unsequenced events will always be sent with SEQ=0x00. Attempting to
-+	 * detect re-transmission would thus just block all events.
-+	 * 
-+	 * While sequence numbers would also allow detection of re-transmitted
-+	 * packets in unsequenced communication, they have only ever been used
-+	 * to cover edge-cases in sequenced transmission. In particular, the
-+	 * only instance of packets being retransmitted (that we are aware of)
-+	 * is due to an ACK timeout. As this does not happen in unsequenced
-+	 * communication, skip the re-transmission check for those packets
-+	 * entirely. 
-+	 */
-+	if (frame->type == SSH_FRAME_TYPE_DATA_NSQ)
-+		return false;
-+
- 	/*
- 	 * Check if SEQ has been seen recently (i.e. packet was
- 	 * re-transmitted and we should ignore it).
- 	 */
- 	for (i = 0; i < ARRAY_SIZE(ptl->rx.blocked.seqs); i++) {
--		if (likely(ptl->rx.blocked.seqs[i] != seq))
-+		if (likely(ptl->rx.blocked.seqs[i] != frame->seq))
- 			continue;
- 
- 		ptl_dbg(ptl, "ptl: ignoring repeated data packet\n");
-@@ -1613,7 +1630,7 @@ static bool ssh_ptl_rx_retransmit_check(struct ssh_ptl *ptl, u8 seq)
- 	}
- 
- 	/* Update list of blocked sequence IDs. */
--	ptl->rx.blocked.seqs[ptl->rx.blocked.offset] = seq;
-+	ptl->rx.blocked.seqs[ptl->rx.blocked.offset] = frame->seq;
- 	ptl->rx.blocked.offset = (ptl->rx.blocked.offset + 1)
- 				  % ARRAY_SIZE(ptl->rx.blocked.seqs);
- 
-@@ -1624,7 +1641,7 @@ static void ssh_ptl_rx_dataframe(struct ssh_ptl *ptl,
- 				 const struct ssh_frame *frame,
- 				 const struct ssam_span *payload)
- {
--	if (ssh_ptl_rx_retransmit_check(ptl, frame->seq))
-+	if (ssh_ptl_rx_retransmit_check(ptl, frame))
- 		return;
- 
- 	ptl->ops.data_received(ptl, payload);
--- 
-2.38.1
-
-From b7935e19a005ed9a4651cc85118ebbb1a67fd11a Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Sun, 13 Nov 2022 20:47:28 +0100
-Subject: [PATCH] wip! platform/surface: aggregator_registry: Add support for
- Surface Laptop 5
-
-Add device nodes to enable support for battery and charger status, the
-ACPI platform profile, as well as internal HID devices (including
-touchpad and keyboard) on the Surface Laptop 5.
-
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
-Patchset: surface-sam
----
- .../surface/surface_aggregator_registry.c        | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index 58ad4cad445c..c01f17227d8f 100644
---- a/drivers/platform/surface/surface_aggregator_registry.c
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
-@@ -234,6 +234,19 @@ static const struct software_node *ssam_node_group_sl3[] = {
- 	NULL,
- };
- 
-+/* Devices for Surface Laptop 5. */
-+static const struct software_node *ssam_node_group_sl5[] = {
-+	&ssam_node_root,
-+	&ssam_node_bat_ac,
-+	&ssam_node_bat_main,
-+	&ssam_node_tmp_pprof,
-+	&ssam_node_hid_main_keyboard,
-+	&ssam_node_hid_main_touchpad,
-+	&ssam_node_hid_main_iid5,
-+	&ssam_node_hid_sam_ucm_ucsi,
-+	NULL,
-+};
-+
- /* Devices for Surface Laptop Studio. */
- static const struct software_node *ssam_node_group_sls[] = {
- 	&ssam_node_root,
-@@ -345,6 +358,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
- 	/* Surface Laptop 4 (13", Intel) */
- 	{ "MSHW0250", (unsigned long)ssam_node_group_sl3 },
- 
-+	/* Surface Laptop 5 */
-+	{ "MSHW0350", (unsigned long)ssam_node_group_sl5 },
-+
- 	/* Surface Laptop Go 1 */
- 	{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },
- 
--- 
-2.38.1
-

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

@@ -1,4 +1,4 @@
-From 8b58f68f9d9b74c76d3b73ab018da8c869065ce0 Mon Sep 17 00:00:00 2001
+From c755a08e97b1167a80e3170a451367d4733462ef 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.38.1
 
-From 0c9af8e6c7fc793f8c4f191deae01cc32cbe3485 Mon Sep 17 00:00:00 2001
+From 59a2156cf207ba8e494bea0552963701f0e5bcf4 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

patches/6.0/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From 6b7d1a46b1fe72431fedc404228ccd9fd5336a23 Mon Sep 17 00:00:00 2001
+From a1ea4cbf29d57b747be48a75f5fd505b322cab3d 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
@@ -20,10 +20,10 @@ Patchset: surface-button
  1 file changed, 8 insertions(+), 25 deletions(-)
 
 diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
-index 480476121c01..36e1bf7b7a01 100644
+index 09489380afda..0f02411a60f1 100644
 --- a/drivers/input/misc/soc_button_array.c
 +++ b/drivers/input/misc/soc_button_array.c
-@@ -495,8 +495,8 @@ static const struct soc_device_data soc_device_MSHW0028 = {
+@@ -507,8 +507,8 @@ static const struct soc_device_data soc_device_MSHW0028 = {
   * Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
   * devices use MSHW0040 for power and volume buttons, however the way they
   * have to be addressed differs. Make sure that we only load this drivers
@@ -34,7 +34,7 @@ index 480476121c01..36e1bf7b7a01 100644
   */
  #define MSHW0040_DSM_REVISION		0x01
  #define MSHW0040_DSM_GET_OMPR		0x02	// get OEM Platform Revision
-@@ -507,31 +507,14 @@ static const guid_t MSHW0040_DSM_UUID =
+@@ -519,31 +519,14 @@ static const guid_t MSHW0040_DSM_UUID =
  static int soc_device_check_MSHW0040(struct device *dev)
  {
  	acpi_handle handle = ACPI_HANDLE(dev);
@@ -75,7 +75,7 @@ index 480476121c01..36e1bf7b7a01 100644
 -- 
 2.38.1
 
-From 92a65615a123d86c00bd4fb5f37c115ee6b2f4ff Mon Sep 17 00:00:00 2001
+From 5dae9fa99921ecb00000aac261906cc39505d9d0 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

patches/6.0/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 7c3231842a9a9fbe76ec16d8e57487bc974d33f0 Mon Sep 17 00:00:00 2001
+From c09a850171761e430e556d87a0fa8fce0a9e9b83 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
@@ -231,7 +231,7 @@ index 91a4d3fc30e0..458537bf4a8e 100644
 -- 
 2.38.1
 
-From 5dea6e7eec4542da7face49ab04277b6a4bb4992 Mon Sep 17 00:00:00 2001
+From 702204ea3859ab5a0c92c9f63abd51568365e953 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

patches/6.0/0009-cameras.patch

@@ -1,4 +1,4 @@
-From 5f97c1a72e69564ecd1c702ebd10573599caccd9 Mon Sep 17 00:00:00 2001
+From a572b4c7ad8c25a998b6e714e5aa84c42ce42ffc 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
@@ -58,10 +58,10 @@ Patchset: cameras
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 42cec8120f18..72d0e599120f 100644
+index adfeb5770efd..a355c64899f8 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -2108,6 +2108,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
+@@ -2109,6 +2109,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
  
  static void acpi_default_enumeration(struct acpi_device *device)
  {
@@ -74,7 +74,7 @@ index 42cec8120f18..72d0e599120f 100644
 -- 
 2.38.1
 
-From 35bc207749cb5121bc7ed46abd3574c6300ecd94 Mon Sep 17 00:00:00 2001
+From 6d3ec96791994ad3864b12c0fd8f8b761725fec0 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 4c895b5f7e2d..f68f031dee46 100644
+index ad9fda586f5e..b26e0297f081 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,12 @@
@@ -131,7 +131,7 @@ index 4c895b5f7e2d..f68f031dee46 100644
  #define IDENTMAP_IPTS		16
  
  const struct iommu_ops intel_iommu_ops;
-@@ -2608,6 +2616,9 @@ static int device_def_domain_type(struct device *dev)
+@@ -2606,6 +2614,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 4c895b5f7e2d..f68f031dee46 100644
  		if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
  	}
-@@ -2999,6 +3010,9 @@ static int __init init_dmars(void)
+@@ -2997,6 +3008,9 @@ static int __init init_dmars(void)
  	if (!dmar_map_gfx)
  		iommu_identity_mapping |= IDENTMAP_GFX;
  
@@ -151,7 +151,7 @@ index 4c895b5f7e2d..f68f031dee46 100644
  	if (!dmar_map_ipts)
  		iommu_identity_mapping |= IDENTMAP_IPTS;
  
-@@ -4803,6 +4817,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
+@@ -4801,6 +4815,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
  	dmar_map_gfx = 0;
  }
  
@@ -170,7 +170,7 @@ index 4c895b5f7e2d..f68f031dee46 100644
  static void quirk_iommu_ipts(struct pci_dev *dev)
  {
  	if (!IS_IPTS(dev))
-@@ -4814,6 +4840,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
+@@ -4812,6 +4838,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 4c895b5f7e2d..f68f031dee46 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);
-@@ -4849,6 +4876,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+@@ -4847,6 +4874,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);
  
@@ -191,7 +191,7 @@ index 4c895b5f7e2d..f68f031dee46 100644
 -- 
 2.38.1
 
-From 3d3411f3b423be99188e78cfb45bb3bd01fa93de Mon Sep 17 00:00:00 2001
+From 703890ef119a7d319e4060c8d07db4948bbb5282 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.38.1
 
-From 7880257dda983a8f995eefdd94950fbd5997f126 Mon Sep 17 00:00:00 2001
+From 0709fa9c304e9e384bdfed3557cc7e0a3f539533 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
@@ -734,7 +734,7 @@ index 000000000000..8451c75b696b
 -- 
 2.38.1
 
-From d1a428917145b370575ceb0d9d285ee52a46e649 Mon Sep 17 00:00:00 2001
+From fdc955621ef399a26e00f2e5da43133a6937236c 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
@@ -849,7 +849,7 @@ index a3fe547b7fce..5648f29ced7b 100644
 -- 
 2.38.1
 
-From a0978e2be037b5f74c9245a09ac6bbd89884ad46 Mon Sep 17 00:00:00 2001
+From 3322e945dd2fc6ec01fe9214569166adf108c87f 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
@@ -892,7 +892,7 @@ index 5648f29ced7b..957a30cd369d 100644
 -- 
 2.38.1
 
-From ce9d5bbc6d47258f4691520776ab74616b0b53d4 Mon Sep 17 00:00:00 2001
+From b57c5e344ffe2d88b91a8285404510e3f953ec27 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
@@ -921,7 +921,7 @@ index 98d081efeef7..c67966cafe10 100644
 -- 
 2.38.1
 
-From aa9fc566974c39e6acb7753102fb6cf8609ca4e6 Mon Sep 17 00:00:00 2001
+From 1da2ea4de299956a5a7831e98eb1633b9917609c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 7 Sep 2022 15:38:08 +0200
 Subject: [PATCH] ipu3-imgu: Fix NULL pointer dereference in

patches/6.0/0010-amd-gpio.patch

@@ -1,4 +1,4 @@
-From d705fdbb4f6aad9f1d2244df16a8dfb37b16fccc Mon Sep 17 00:00:00 2001
+From e25e41f5dfac0998e58d95be59309c3519ed6457 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 907cc98b1938..0116d27b29ea 100644
 -- 
 2.38.1
 
-From 7555e16eb0500c8976aa3c08ac6e92a4426f7213 Mon Sep 17 00:00:00 2001
+From db29395d12ceaa393136f04c80f4cf099301f3f1 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