Browse Source

Update v6.0 patches

Changes:
 - Re-add bridge D3 quirk for mwifiex
 - Rebase onto v6.0.17

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/74bff9ec545033c2c8a420a2667900ac563d0465
Maximilian Luz 2 years ago
parent
commit
de82d17955

+ 1 - 1
patches/6.0/0001-surface3-oemb.patch

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

+ 157 - 2
patches/6.0/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 4dd3a5a732c5a86ea14fab4c49415498151b37bd Mon Sep 17 00:00:00 2001
+From 0a3c73c866294bef1aac20ab3d465d75f1ca7de3 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,162 @@ index d6ff964aec5b..5d30ae39d65e 100644
 -- 
 2.39.0
 
-From 25f620092034d6b0c1761771711227a263cf84c9 Mon Sep 17 00:00:00 2001
+From 8afcd8d1453c9667b006676e3501276942751712 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+
+
+Currently, mwifiex fw will crash after suspend on recent kernel series.
+On Windows, it seems that the root port of wifi will never enter D3 state
+(stay on D0 state). And on Linux, disabling the D3 state for the
+bridge fixes fw crashing after suspend.
+
+This commit disables the D3 state of root port on driver initialization
+and fixes fw crashing after suspend.
+
+Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
+Patchset: mwifiex
+---
+ drivers/net/wireless/marvell/mwifiex/pcie.c   |  7 +++++
+ .../wireless/marvell/mwifiex/pcie_quirks.c    | 27 +++++++++++++------
+ .../wireless/marvell/mwifiex/pcie_quirks.h    |  1 +
+ 3 files changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
+index 3aeff40179cf..a5f273248977 100644
+--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
++++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
+@@ -368,6 +368,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
+ 					const struct pci_device_id *ent)
+ {
+ 	struct pcie_service_card *card;
++	struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
+ 	int ret;
+ 
+ 	pr_debug("info: vendor=0x%4.04X device=0x%4.04X rev=%d\n",
+@@ -409,6 +410,12 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
+ 		return -1;
+ 	}
+ 
++	/* disable bridge_d3 for Surface gen4+ devices to fix fw crashing
++	 * after suspend
++	 */
++	if (card->quirks & QUIRK_NO_BRIDGE_D3)
++		parent_pdev->bridge_d3 = false;
++
+ 	return 0;
+ }
+ 
+diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
+index f46b06f8d643..99b024ecbade 100644
+--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
++++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
+@@ -14,7 +14,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Pro 5",
+@@ -24,7 +25,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Pro 5 (LTE)",
+@@ -34,7 +36,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Pro 6",
+@@ -43,7 +46,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Book 1",
+@@ -52,7 +56,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Book 2",
+@@ -61,7 +66,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Laptop 1",
+@@ -70,7 +76,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{
+ 		.ident = "Surface Laptop 2",
+@@ -79,7 +86,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
+ 		},
+ 		.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
+-					QUIRK_DO_FLR_ON_BRIDGE),
++					QUIRK_DO_FLR_ON_BRIDGE |
++					QUIRK_NO_BRIDGE_D3),
+ 	},
+ 	{}
+ };
+@@ -99,6 +107,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
+ 		dev_info(&pdev->dev, "quirk reset_d3cold enabled\n");
+ 	if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
+ 		dev_info(&pdev->dev, "quirk do_flr_on_bridge enabled\n");
++	if (card->quirks & QUIRK_NO_BRIDGE_D3)
++		dev_info(&pdev->dev,
++			 "quirk no_brigde_d3 enabled\n");
+ }
+ 
+ static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
+diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
+index 5d30ae39d65e..c14eb56eb911 100644
+--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
++++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
+@@ -5,6 +5,7 @@
+ 
+ #define QUIRK_FW_RST_D3COLD	BIT(0)
+ #define QUIRK_DO_FLR_ON_BRIDGE	BIT(1)
++#define QUIRK_NO_BRIDGE_D3	BIT(2)
+ 
+ void mwifiex_initialize_quirks(struct pcie_service_card *card);
+ int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
+-- 
+2.39.0
+
+From 1fff21c7ef643136d35d0d3ef42360d790d2db11 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

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

@@ -1,4 +1,4 @@
-From 01b80699ef6d6e161f3e32ebd66378de2a7d9e01 Mon Sep 17 00:00:00 2001
+From 0a874176828ae60dfa853fcacbe42c81acb9fae2 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

+ 3 - 3
patches/6.0/0004-ipts.patch

@@ -1,4 +1,4 @@
-From 8619478685880d8be9e9075fc099a697af2af3f2 Mon Sep 17 00:00:00 2001
+From f1899447af710b26d802c2ef39870d8da134c6c4 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.39.0
 
-From a954c1b9c5793c67426c8afe57ee43663cd2097e Mon Sep 17 00:00:00 2001
+From 60601384b67fb77fa7cd7a15748e9b858f2e5b4d 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.39.0
 
-From ed850a31417fd64632804858ec9ed6b9f2addcc7 Mon Sep 17 00:00:00 2001
+From 9bf06b18d485c3106536d4c90306a43fc22eae50 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

+ 9 - 9
patches/6.0/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From 161b5b440bb909cea1c537d0990d615034e45b10 Mon Sep 17 00:00:00 2001
+From 91f23116f351fd47b02b04da4c76ea783c9eebf7 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.39.0
 
-From 8b7727744aecefccc414101712317a394dce068c Mon Sep 17 00:00:00 2001
+From ac0428a6fceffef1e7f70ceaf13747d84dbd42ee 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.39.0
 
-From bdbe63706785a15dc9273cc250da043c6781308f Mon Sep 17 00:00:00 2001
+From f61dd358bf4035f1649ca6157b267724415b7cb2 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.39.0
 
-From a7836f69679d58467b1a10ee421e1aea4167e16a Mon Sep 17 00:00:00 2001
+From 96ab89bad347e0da3226840a2eb3374259dc87bc 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.39.0
 
-From e3c37f9985b30b37f033994f3ef98b20605f9c74 Mon Sep 17 00:00:00 2001
+From ce4c80d47d379496759ac5f0fa2f84cf69bcb7b8 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.39.0
 
-From 934ec591796e2660586d2cb6bbb79e7c252fc3a7 Mon Sep 17 00:00:00 2001
+From 7398db18064b427803b35cb187557a4db93765e2 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.39.0
 
-From f89138d56d6f696004160a4fe60b996345927d77 Mon Sep 17 00:00:00 2001
+From a26d560c4ea2e18333d02015506274f94b81f062 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.39.0
 
-From 3db29f20ee8a0a41ac9671b366821ec2e7726a59 Mon Sep 17 00:00:00 2001
+From 3111088adbc891b8e976d664179ab97a75e5019f 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.39.0
 
-From fc8fca2418b298c9d426bb4ad8030de8b82f63ab Mon Sep 17 00:00:00 2001
+From 750fd72a40d0b59cf14d2f60d96129e07c8feb3b 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

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

@@ -1,4 +1,4 @@
-From f27ced1b062a4e98963e889baf6e14e1a79dd13f Mon Sep 17 00:00:00 2001
+From 39de2cbafc518c16f54502cba518292fa327c2ba 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.39.0
 
-From 23b2238082174c00e417fbfa55e54e9720b9c5a6 Mon Sep 17 00:00:00 2001
+From e6873dbb15c7462b6bf0ed744a0a9533a3221c3c 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

+ 2 - 2
patches/6.0/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From 315a567cb760b43d3e833ffdc1501c902f0b4751 Mon Sep 17 00:00:00 2001
+From 9720c3a721dce97129a6237686f595f6fa1a0c46 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 09489380afda..0f02411a60f1 100644
 -- 
 2.39.0
 
-From c410baf1fa6b53bda5466dfa50c9e17a8c68aff8 Mon Sep 17 00:00:00 2001
+From 5d18576868861ca3940c80571624244e680d88c1 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

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

@@ -1,4 +1,4 @@
-From fface75c74efab79410b12670a5c754bca8e964a Mon Sep 17 00:00:00 2001
+From 13d49496820a68c21b5ac20041d2cf74867432bf 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 91a4d3fc30e0..458537bf4a8e 100644
+index 372cbdd223e0..fe849df6a948 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -34,7 +34,10 @@
@@ -216,7 +216,7 @@ index 91a4d3fc30e0..458537bf4a8e 100644
  	del_timer_sync(&td->release_timer);
  
  	sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
-@@ -2191,6 +2282,11 @@ static const struct hid_device_id mt_devices[] = {
+@@ -2195,6 +2286,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 91a4d3fc30e0..458537bf4a8e 100644
 -- 
 2.39.0
 
-From 6f4aae71020255227d1f6480202a37f5451a29be Mon Sep 17 00:00:00 2001
+From e41b6a2bd630af9fbdd8fb867b864ebacb32cffa 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 458537bf4a8e..3d7d002a662f 100644
+index fe849df6a948..3a7a43eb9fbe 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -76,6 +76,7 @@ MODULE_LICENSE("GPL");

+ 8 - 8
patches/6.0/0009-cameras.patch

@@ -1,4 +1,4 @@
-From 9632dfb9c8c9e274f08ca9893bd7fcbfbe82f302 Mon Sep 17 00:00:00 2001
+From 430f74608d06e994535175627d00b7d62abdd828 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 adfeb5770efd..a355c64899f8 100644
 -- 
 2.39.0
 
-From 6a48a892cbe763051cd399763bdf365c8d687900 Mon Sep 17 00:00:00 2001
+From 21d0337ca18b7a923f5ccd9e67aa978848f29efd 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
@@ -191,7 +191,7 @@ index 5246e3f25ac1..646a84a545e6 100644
 -- 
 2.39.0
 
-From f027818154efcdb8c596641fa9818a35171c1924 Mon Sep 17 00:00:00 2001
+From 21b1211e77ae7cc95bb37f071279692a91c984f4 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.39.0
 
-From c80da6a623b0de4d3cb19dc2539096249871ca93 Mon Sep 17 00:00:00 2001
+From 192278672d992a5b7b265b9e3f4dd3ff1a40be2a 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.39.0
 
-From 148b9924f50afd01bf11f83bfc15e4626ad9eb62 Mon Sep 17 00:00:00 2001
+From daa4ef965d72676c34d26d6d2ba3b47d35c860f9 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.39.0
 
-From 263bfb4019c9641a4a9491f26de3a570ce676837 Mon Sep 17 00:00:00 2001
+From babc2aa098f54e0fe830242e2b5a9f19be0922c1 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.39.0
 
-From 9cfc3f8c36e7db0b3797d6587aeee0df9a88ff02 Mon Sep 17 00:00:00 2001
+From 913f266da3ed3df1276361c5c9a3f352cc2f3a14 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.39.0
 
-From f079ca1df1e6275024fc884b1cd53915cbd9566d Mon Sep 17 00:00:00 2001
+From 8b77676a1e6c55f90c9ca3a6e0d63262a1b8da82 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

+ 2 - 2
patches/6.0/0010-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 7c603a1a4bb93987292978b750553e73f2db9bdd Mon Sep 17 00:00:00 2001
+From 17553e3e80c6efea023e3ed54131ee02a32fb2ef 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.39.0
 
-From 7ab240bdb721f84a0995c516b4eaea1e2dfa1090 Mon Sep 17 00:00:00 2001
+From d8080092e1c6700c9fba3442a8c25946ef168876 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

+ 1 - 1
patches/6.0/0011-rtc.patch

@@ -1,4 +1,4 @@
-From dc1bcde1c083db3f803c47122b49107d14ac092a Mon Sep 17 00:00:00 2001
+From c66f37c54939a3aa60ecacf00b4cc226599d021f Mon Sep 17 00:00:00 2001
 From: "Bart Groeneveld | GPX Solutions B.V" <bart@gpxbv.nl>
 Date: Mon, 5 Dec 2022 16:08:46 +0100
 Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms