Browse Source

Update v6.1 patches

Changes:
 - Rebase onto v6.1.47

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/aa90b074f62489a346e57f81ef083c68249081f3
Maximilian Luz 1 year ago
parent
commit
aa67825a29

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

@@ -1,4 +1,4 @@
-From ad7d754bbad7249436869686ab22a4fd3fb969ff Mon Sep 17 00:00:00 2001
+From 3f94424c9bf069313dba60486c3ab56589f106d5 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 cdcbf04b8832..958305779b12 100644
  };
  
 -- 
-2.41.0
+2.42.0
 

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

@@ -1,4 +1,4 @@
-From 768db3f72da53f37ca081ac5054683d613f30107 Mon Sep 17 00:00:00 2001
+From 47a4a425ad34d3e874b403985f2ded51c7f8c654 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
@@ -163,9 +163,9 @@ index d6ff964aec5b..5d30ae39d65e 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.41.0
+2.42.0
 
-From 0c587da4e0905ce3ef387582d2fbf4d52915a6d1 Mon Sep 17 00:00:00 2001
+From 93616c8371d139434e92055aa26f082b58d99f5a 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+
@@ -318,9 +318,9 @@ index 5d30ae39d65e..c14eb56eb911 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.41.0
+2.42.0
 
-From 3a15683fd9b27ae45e843f0057d072728d69c10a Mon Sep 17 00:00:00 2001
+From c9cfe1a0af912391a4c50500d2db58ad8a0e609d 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
@@ -356,7 +356,7 @@ Patchset: mwifiex
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index faad19b396d5..cc7bb57c4f90 100644
+index d6f405763c56..934246a42ef8 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -64,6 +64,7 @@ static struct usb_driver btusb_driver;
@@ -375,7 +375,7 @@ index faad19b396d5..cc7bb57c4f90 100644
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
-@@ -3950,6 +3952,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -3953,6 +3955,19 @@ static int btusb_probe(struct usb_interface *intf,
  	if (id->driver_info & BTUSB_MARVELL)
  		hdev->set_bdaddr = btusb_set_bdaddr_marvell;
  
@@ -396,5 +396,5 @@ index faad19b396d5..cc7bb57c4f90 100644
  	    (id->driver_info & BTUSB_MEDIATEK)) {
  		hdev->setup = btusb_mtk_setup;
 -- 
-2.41.0
+2.42.0
 

+ 2 - 2
patches/6.1/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From c28b29f1bfc17394be89ac062d5c9d23291b0fca Mon Sep 17 00:00:00 2001
+From c15d272bc62f6091e4de764136a2b6c1373916c5 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 6cdb225b7eac..19c036751fb1 100644
  	ret = firmware_request_nowarn(&fw, filename, ar->dev);
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.41.0
+2.42.0
 

+ 14 - 14
patches/6.1/0004-ipts.patch

@@ -1,4 +1,4 @@
-From a65b63950cd0b194805341e942974a502409fea1 Mon Sep 17 00:00:00 2001
+From 8290af992c14704749d967be0871230dc84d7ca6 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 5bf0d50d55a0..c13864512229 100644
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 -- 
-2.41.0
+2.42.0
 
-From 9586561bea522433c4f4809eddd054852446ca39 Mon Sep 17 00:00:00 2001
+From 08c73591e888d9abeb72f2d278e076e4f1e396e2 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
@@ -134,9 +134,9 @@ index d4b5d20bd6dd..3965979c7bd4 100644
  {
  	if (risky_device(dev))
 -- 
-2.41.0
+2.42.0
 
-From 3125857449c9287908163b9ee5e96b92dc46f081 Mon Sep 17 00:00:00 2001
+From e7698e8624234c87edb35520b382f48d70ad3878 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:00:59 +0100
 Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus
@@ -2984,9 +2984,9 @@ index 000000000000..a314843599fc
 +
 +#endif /* IPTS_THREAD_H */
 -- 
-2.41.0
+2.42.0
 
-From a40dd52ad93466143a211a442226c9d30aa968eb Mon Sep 17 00:00:00 2001
+From e99815f09405c18ad632c16df4070cc0524dc807 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Fri, 28 Apr 2023 15:41:12 +0200
 Subject: [PATCH] Update IPTS from module repo
@@ -3176,9 +3176,9 @@ index 6cbb24a8a054..e0c400f420b9 100644
  
  int ipts_resources_init(struct ipts_resources *res, struct device *dev, size_t ds, size_t fs);
 -- 
-2.41.0
+2.42.0
 
-From 6d826fa0bc6b7741f479b960e6a1ba09a291fa93 Mon Sep 17 00:00:00 2001
+From b1d4f0bad7ad1b8950928c4db016f27c4f4e1256 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 17 Jul 2023 18:10:43 +0200
 Subject: [PATCH] Update IPTS from module repo
@@ -4431,9 +4431,9 @@ index a314843599fc..1f966b8b32c4 100644
   * @thread: The thread that should stop.
   *
 -- 
-2.41.0
+2.42.0
 
-From 720c3a865bf284064ef1a946e8f8cf2fc9a3452e Mon Sep 17 00:00:00 2001
+From d52e8b46f574bb2c570a76e907a3f11f2cab5a4a Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 22 Jul 2023 17:08:56 +0200
 Subject: [PATCH] Update IPTS from module repo
@@ -4465,9 +4465,9 @@ index e835b460aa79..7c5cbafdb279 100644
  
  	memcpy(buffer, ipts_singletouch_descriptor, sizeof(ipts_singletouch_descriptor));
 -- 
-2.41.0
+2.42.0
 
-From fecb83e5e79527e0e6d32baa9342f661321d8e46 Mon Sep 17 00:00:00 2001
+From 04f77a5e9411e3b83d77038de8eb235a8dd94f50 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 23 Jul 2023 17:55:15 +0200
 Subject: [PATCH] Update IPTS from module repo
@@ -4498,5 +4498,5 @@ index 7c5cbafdb279..198dc65d7887 100644
 +		return ipts_eds2_set_feature(ipts, buffer, size, report_id, feedback_type);
  }
 -- 
-2.41.0
+2.42.0
 

+ 4 - 4
patches/6.1/0005-ithc.patch

@@ -1,4 +1,4 @@
-From c88187622cfff2b8ce75ac3e11b2efc6184e48fd Mon Sep 17 00:00:00 2001
+From e8af7e5a14c8a0b9099827d1306f44f52adf6396 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:03:38 +0100
 Subject: [PATCH] iommu: intel: Disable source id verification for ITHC
@@ -37,9 +37,9 @@ index 5962bb5027d0..86fa129d10d4 100644
  	 * DMA alias provides us with a PCI device and alias.  The only case
  	 * where the it will return an alias on a different bus than the
 -- 
-2.41.0
+2.42.0
 
-From a2b04fd81925f1613a3db6a303eb137589f8f298 Mon Sep 17 00:00:00 2001
+From 17b17c7a1f08911384fac4fffd89a8ecc08fe6aa Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:10:54 +0100
 Subject: [PATCH] hid: Add support for Intel Touch Host Controller
@@ -1429,5 +1429,5 @@ index 000000000000..6a9b0d480bc1
 +void ithc_log_regs(struct ithc *ithc);
 +
 -- 
-2.41.0
+2.42.0
 

+ 28 - 28
patches/6.1/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From 0cee5fe37a2aa4a0f9589d33e4015be7d40ac199 Mon Sep 17 00:00:00 2001
+From b1e03d23d2f1008931450828548d066a6537ee18 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:20 +0100
 Subject: [PATCH] platform/surface: aggregator: Improve documentation and
@@ -287,9 +287,9 @@ index 45501b6e54e8..5c4ae1a26183 100644
   * Known SSH/EC target categories.
   *
 -- 
-2.41.0
+2.42.0
 
-From 614e9906b55cc94b3daaa2dccce6dc583e509b2c Mon Sep 17 00:00:00 2001
+From 1f72a4ee3e98475a0ca1e30c8e71a0153ed5e1e2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:21 +0100
 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
@@ -484,9 +484,9 @@ index 2a2c17771d01..55cc61bba1da 100644
  		ssam_show_generic_u8_field(__entry->cid),
  		ssam_show_generic_u8_field(__entry->iid),
 -- 
-2.41.0
+2.42.0
 
-From 2fc4deee40a60bd6bf7f9cc23ab3ed693e7bde42 Mon Sep 17 00:00:00 2001
+From 267faa983a46c8d4136851178857a494a98fa1b4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:22 +0100
 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
@@ -527,9 +527,9 @@ index 43061514be38..62f27cdb6ca8 100644
  	.instance_id     = 0x00,
  });
 -- 
-2.41.0
+2.42.0
 
-From b18ed0927d76b3cdeb46d19bf0ab537398fad57d Mon Sep 17 00:00:00 2001
+From da102a3aae53f4795a1d6b41c7373c04fb6517f2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:23 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
@@ -579,9 +579,9 @@ index af8b547cffdc..c8ecbdbb516c 100644
  	.instance_id     = 0x00,
  });
 -- 
-2.41.0
+2.42.0
 
-From 7b080bb2497fd84be7d67a3df9a2b064ce08d685 Mon Sep 17 00:00:00 2001
+From 17d2e5ad1b23a71acb222da2c9aa4c873602d664 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:24 +0100
 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
@@ -677,9 +677,9 @@ index ed36944467f9..0de76a784a35 100644
  	.instance_id     = 0x00,
  });
 -- 
-2.41.0
+2.42.0
 
-From 6357e4792cdc2db097878268c58ce55b9c762bd6 Mon Sep 17 00:00:00 2001
+From 839ba652d0b4aef5ecc4a9d46bb4d7bc2074f3ae Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:25 +0100
 Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding
@@ -711,9 +711,9 @@ index 0635341bc517..42933bf3e925 100644
  	shid->uid.function = 0;
  
 -- 
-2.41.0
+2.42.0
 
-From a6fde5a5e64c027ecb1c09c09fe9ac477f8e16f4 Mon Sep 17 00:00:00 2001
+From a4766c51764191c1eb631ec14723bf7da61a2b3d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:26 +0100
 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
@@ -947,9 +947,9 @@ index 46c45d1b6368..4da20b7a0ee5 100644
  /*
   * enum ssam_device_flags - Flags for SSAM client devices.
 -- 
-2.41.0
+2.42.0
 
-From 698516013781e684f68ebbeefc7e68c4b18c34ce Mon Sep 17 00:00:00 2001
+From 1d54fae05c030c2d11eebdab3edfec591e22df70 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:27 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
@@ -1002,9 +1002,9 @@ index 023f126121d7..296f72d52e6a 100644
  };
  
 -- 
-2.41.0
+2.42.0
 
-From 207cea16da19bacb9124f8aa7e64fddcfbebd317 Mon Sep 17 00:00:00 2001
+From be85cd44f0f6758d7d1aa2f2b395b07ce3e93a1c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 20 Dec 2022 18:56:08 +0100
 Subject: [PATCH] platform/surface: aggregator: Rename top-level request
@@ -1549,9 +1549,9 @@ index 4da20b7a0ee5..1545e5567b15 100644
   */
  #define SSAM_DEFINE_SYNC_REQUEST_CL_WR(name, atype, rtype, spec...)		\
 -- 
-2.41.0
+2.42.0
 
-From 1481d98b49bc9bd577956e12b524e7aa5d8ccf48 Mon Sep 17 00:00:00 2001
+From 4145e07216b6717344a07020f6a1e339688e913e Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Wed, 18 Jan 2023 11:38:23 +0200
 Subject: [PATCH] platform/surface: Switch to use acpi_evaluate_dsm_typed()
@@ -1605,9 +1605,9 @@ index f004a2495201..7b6d887dccdb 100644
  
  static irqreturn_t shps_handle_irq(int irq, void *data)
 -- 
-2.41.0
+2.42.0
 
-From c2bf1659724cf37f50fbc0378a8b52aee6b8f77e Mon Sep 17 00:00:00 2001
+From 5dd79113c76e9d8e2d5b84453c4b814de2b58154 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 4 Mar 2023 20:09:36 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle
@@ -1913,9 +1913,9 @@ index a18e9fc7896b..f9a58db6afde 100644
  }
  
 -- 
-2.41.0
+2.42.0
 
-From 32286cdfe343649524b01d5f49b3d53c30e4d352 Mon Sep 17 00:00:00 2001
+From 2713284df9abcf28eceb9d90b00cafd515b535be Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 23:33:43 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for
@@ -2030,9 +2030,9 @@ index f9a58db6afde..4a029f5db20a 100644
  		return ssam_pos_state_is_tablet_mode_sls(sw, state->state);
  
 -- 
-2.41.0
+2.42.0
 
-From ff52a0d4d2b601e0475e751b8130e05059d29717 Mon Sep 17 00:00:00 2001
+From 76d7a7348fbb41558bccc73192f37d7e6a6475eb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 23:41:18 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -2061,9 +2061,9 @@ index 296f72d52e6a..0fe5be539652 100644
  	&ssam_node_hid_kip_penstash,
  	&ssam_node_hid_kip_touchpad,
 -- 
-2.41.0
+2.42.0
 
-From 6408390b21695975d7021a194238031c36ab423d Mon Sep 17 00:00:00 2001
+From a334e2e9accafcb3d71f950219625dd985c6c64a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 18 May 2023 22:57:17 +0200
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for book
@@ -2115,5 +2115,5 @@ index 4a029f5db20a..c0a1a5869246 100644
  
  	case SSAM_POS_COVER_CLOSED:
 -- 
-2.41.0
+2.42.0
 

+ 4 - 4
patches/6.1/0007-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 1c1113656a74d692b14c7215da7142e440a7f7b4 Mon Sep 17 00:00:00 2001
+From 4267e38d64cdd54af7b4d56b3ced05f539b67735 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 4dd777cc0c89..b2338618163a 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.41.0
+2.42.0
 
-From d8f3e99147036bd9047607309201d185622e9ab6 Mon Sep 17 00:00:00 2001
+From 090ac4c9697262d85323d1c8a7749cf4ba1974f1 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.41.0
+2.42.0
 

+ 4 - 4
patches/6.1/0008-surface-button.patch

@@ -1,4 +1,4 @@
-From ded0a12212d0ccb2146597b91fba08a40f026739 Mon Sep 17 00:00:00 2001
+From 8c009dd1fc82739f207820a0f251266b8c6f8b49 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 e79f5497948b..2bddbe6e9ea4 100644
  
  /*
 -- 
-2.41.0
+2.42.0
 
-From 9c4831cc471e8009559d4d05b8a6b5b73df50559 Mon Sep 17 00:00:00 2001
+From 1f6dbbdfdb055776ab657b3e696031417ceedb9d 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.41.0
+2.42.0
 

+ 7 - 7
patches/6.1/0009-surface-typecover.patch

@@ -1,4 +1,4 @@
-From bff1fad1c92b30e8867724fcacfa8e8570f8957b Mon Sep 17 00:00:00 2001
+From ec55618600e50ba996100f1d4a1c155592a89c99 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 18 Feb 2023 01:02:49 +0100
 Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
@@ -23,7 +23,7 @@ Patchset: surface-typecover
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 934b3d997702..2c6604c6e8e1 100644
+index 15e9bd180a1d..0d70461d01e1 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
 @@ -220,6 +220,9 @@ static const struct usb_device_id usb_quirk_list[] = {
@@ -37,9 +37,9 @@ index 934b3d997702..2c6604c6e8e1 100644
  	{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
  
 -- 
-2.41.0
+2.42.0
 
-From 1cc5cdf03b1309de4d5e8923b6f0d291da416a43 Mon Sep 17 00:00:00 2001
+From 655fdf62cc5fc7c684c9337c734ba8e57d1f4ded 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
@@ -270,9 +270,9 @@ index e31be0cb8b85..63fd042aba6b 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.41.0
+2.42.0
 
-From 2b3bce354299450e6a9d4733b8a428d274165b97 Mon Sep 17 00:00:00 2001
+From 60afd1e9ab313862c9682f84e852697744e593f4 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
@@ -570,5 +570,5 @@ index 63fd042aba6b..508a250ff4bf 100644
  	unregister_pm_notifier(&td->pm_notifier);
  	del_timer_sync(&td->release_timer);
 -- 
-2.41.0
+2.42.0
 

+ 4 - 4
patches/6.1/0010-surface-shutdown.patch

@@ -1,4 +1,4 @@
-From 170a8dc8454ec59bbf962f21a5c0e6e46c2345c5 Mon Sep 17 00:00:00 2001
+From 1feea468e51f137c2dd38c828d9ef809c9cadafa Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 22:12:24 +0100
 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod
@@ -37,10 +37,10 @@ index f47a3b10bf50..9ea4352aac56 100644
  
  	if (drv && drv->shutdown)
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index ccc90656130a..e74ec9370ac2 100644
+index 472fa2c8ebce..6e86d7753d7d 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -6033,3 +6033,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
+@@ -6035,3 +6035,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size);
  #endif
@@ -93,5 +93,5 @@ index 9f617ffdb863..ca7dbe7937ae 100644
  	atomic_t	enable_cnt;	/* pci_enable_device has been called */
  
 -- 
-2.41.0
+2.42.0
 

+ 2 - 2
patches/6.1/0011-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 2201b3c5dd1df3e5cc4889a2a437b1cd73138f93 Mon Sep 17 00:00:00 2001
+From a25dee6dcd5d37ae8a6cd7a416fea0004ae6c93d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 12 Mar 2023 01:41:57 +0100
 Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9
@@ -47,5 +47,5 @@ index c219b840d491..69c4352e8406 100644
  		.ident = "Surface Book 1",
  		.matches = {
 -- 
-2.41.0
+2.42.0
 

+ 18 - 18
patches/6.1/0012-cameras.patch

@@ -1,4 +1,4 @@
-From c16a437fefb02df0cc349d5fd7d5fd79a8e485f0 Mon Sep 17 00:00:00 2001
+From 049c7f345a2fcfb46bf8af08db776e49345c9b65 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 dbfa58e799e2..ccbd3f8b523e 100644
+index a0e347f6f97e..167dbf4cf623 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -2106,6 +2106,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
+@@ -2107,6 +2107,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)
  {
@@ -72,9 +72,9 @@ index dbfa58e799e2..ccbd3f8b523e 100644
  	 * Do not enumerate devices with enumeration_by_parent flag set as
  	 * they will be enumerated by their respective parents.
 -- 
-2.41.0
+2.42.0
 
-From bd6a8cd29658d675fe7873495960b4c83e148ffa Mon Sep 17 00:00:00 2001
+From c05344a730e1d9bc31c80adb6fd867e726de7e33 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 3965979c7bd4..509cfb9f6695 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  
 -- 
-2.41.0
+2.42.0
 
-From f4135b8b70db5aa3f47573411fdf7c2b40e99707 Mon Sep 17 00:00:00 2001
+From 143568e6ae1aba458cdb5aa2082cad5c8a8f7234 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 5b8d1a9620a5..6a0ff035cf20 100644
  
  	return 0;
 -- 
-2.41.0
+2.42.0
 
-From ec7302f8f20f55d2b23a4bc74f6d4ba2bfee17b9 Mon Sep 17 00:00:00 2001
+From c600cddab0484439a9c07adb88a7794fc0f35a7b 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
@@ -730,9 +730,9 @@ index 000000000000..180b04d2a6b3
 +MODULE_DESCRIPTION("DW9719 VCM Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.41.0
+2.42.0
 
-From 6cdda13e832ef531d375a38b72e1546acbe0f173 Mon Sep 17 00:00:00 2001
+From 6a2863a6196e8cd3f9cd9fb5e65c1d44859e23bb 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
@@ -845,9 +845,9 @@ index 3b76a9d0383a..38f9f4da1922 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.41.0
+2.42.0
 
-From 4bc8f651a74a69c15cbf1c39237a561696d2123c Mon Sep 17 00:00:00 2001
+From 772e56f054dd8c66cab75cdf55df273926eaac02 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
@@ -888,9 +888,9 @@ index 38f9f4da1922..82681df7d794 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.41.0
+2.42.0
 
-From 3181d00011c53e8849d0107cc7855093e594d302 Mon Sep 17 00:00:00 2001
+From 1f22a8024e12613dbc9963830d35f2f68dbe9228 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
@@ -917,9 +917,9 @@ index 98d081efeef7..c67966cafe10 100644
  	select VIDEO_V4L2_SUBDEV_API
  	select V4L2_ASYNC
 -- 
-2.41.0
+2.42.0
 
-From 014022664b67244125c742df36277cbd5a398e79 Mon Sep 17 00:00:00 2001
+From 61b32f0730f7e36a869d35eac3483dec2871bb0a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Thu, 2 Mar 2023 12:59:39 +0000
 Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
@@ -973,5 +973,5 @@ index c42c3faa2c32..6f4b8e24eb56 100644
  	if (!func)
  		return 0;
 -- 
-2.41.0
+2.42.0
 

+ 4 - 4
patches/6.1/0013-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 661bb474e5869fe03aff5684b6e4425ae5f2036c Mon Sep 17 00:00:00 2001
+From 8d134ad0125086e62f08d82ff534b7240ecc3244 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 0f762070a5e1..6362dd452233 100644
  	mp_config_acpi_legacy_irqs();
  
 -- 
-2.41.0
+2.42.0
 
-From be8581b488b86589fab6cc79f8313cdf502f1840 Mon Sep 17 00:00:00 2001
+From 90f9a6629585ead44dfaef9c9f87555bde1caffe 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 6362dd452233..8a092c2c6fa8 100644
  };
  
 -- 
-2.41.0
+2.42.0
 

+ 2 - 2
patches/6.1/0014-rtc.patch

@@ -1,4 +1,4 @@
-From 312de6ec6e777b542b08e4674ba4f0d840c72fba Mon Sep 17 00:00:00 2001
+From 61618f660b94ef105dd327b5cb5c00879549970c 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
@@ -105,5 +105,5 @@ index e9b8e8305e23..944276934e7e 100644
  		ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group);
  		if (ret)
 -- 
-2.41.0
+2.42.0