ソースを参照

Update v6.13 patches

Changes:
 - Add basic SAM support for Surface Laptop 7 (Intel)
 - Rebase onto v6.13.11

 Links:
  - kernel: https://github.com/linux-surface/kernel/commit/7cbc63f6b6c283aff7d337169751b0157d9cdd5b
Maximilian Luz 2 ヶ月 前
コミット
2045881bdd

+ 4 - 4
patches/6.13-fedora/0001-secureboot.patch

@@ -1,4 +1,4 @@
-From 94ade6781f154dfd06900517a4c18d20aad64c70 Mon Sep 17 00:00:00 2001
+From 7c9810fb3e614eba177052a3d4ed949de0c1a75e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 9 Jun 2024 19:48:58 +0200
 Subject: [PATCH] Revert "efi/x86: Set the PE/COFF header's NX compat flag
@@ -33,9 +33,9 @@ index b5c79f43359b..a1bbedd989e4 100644
  	.long	0				# SizeOfStackReserve
  	.long	0				# SizeOfStackCommit
 -- 
-2.48.1
+2.49.0
 
-From 2bb6335216913bc247e2bc41f1ea2ff0a8981a4a Mon Sep 17 00:00:00 2001
+From 6ff310318f3a73e852625038b146dabe81501c34 Mon Sep 17 00:00:00 2001
 From: "J. Eduardo" <j.eduardo@gmail.com>
 Date: Sun, 25 Aug 2024 14:17:45 +0200
 Subject: [PATCH] PM: hibernate: Add a lockdown_hibernate parameter
@@ -108,5 +108,5 @@ index 10a01af63a80..e53e4a86e4cc 100644
  __setup("nohibernate", nohibernate_setup);
 +__setup("lockdown_hibernate", lockdown_hibernate_setup);
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13-fedora/0002-surface3.patch

@@ -1,4 +1,4 @@
-From 5e29598180e78ed9adbe88731ce2bbc9affb0ccc Mon Sep 17 00:00:00 2001
+From 481ba7958a7d0ae882d6a4ccbf47fa326acde51c 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,9 +97,9 @@ index e4c3492a0c28..0b930c91bccb 100644
  };
  
 -- 
-2.48.1
+2.49.0
 
-From cd79bb7fed2cd0269d368cc4dea3194564262883 Mon Sep 17 00:00:00 2001
+From 2e5a1e90796ecbf74d851f179aeebd327da00f07 Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Subject: [PATCH] surface3-spi: workaround: disable DMA mode to avoid crash by
@@ -230,5 +230,5 @@ index 6074b7730e86..6aa3e1d6f160 100644
  }
  
 -- 
-2.48.1
+2.49.0
 

+ 8 - 8
patches/6.13-fedora/0003-mwifiex.patch

@@ -1,4 +1,4 @@
-From c428669fce7eca5a597c0e7b0072e930f4895819 Mon Sep 17 00:00:00 2001
+From c4e6fa29a9f4a4a09a618574a8ecf7efa1e051fd 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.48.1
+2.49.0
 
-From 72f5a2ee698b9d344ea097930f2a0b7b617951d7 Mon Sep 17 00:00:00 2001
+From 1b3a3a96870f12d3d7001335039530e93b8bac36 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.48.1
+2.49.0
 
-From 964b1e54a083db2d78ba2352f706d297ed8b13c4 Mon Sep 17 00:00:00 2001
+From 517f11111b957f8e90dc9488a6bad4faf0fcec88 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 72e85673b709..110c983dfd53 100644
+index 75dbe07e07e2..fd0f1aa5eaa9 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -65,6 +65,7 @@ static struct usb_driver btusb_driver;
@@ -375,7 +375,7 @@ index 72e85673b709..110c983dfd53 100644
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
-@@ -3869,6 +3871,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -3870,6 +3872,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 72e85673b709..110c983dfd53 100644
  	    (id->driver_info & BTUSB_MEDIATEK)) {
  		hdev->setup = btusb_mtk_setup;
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13-fedora/0004-ath10k.patch

@@ -1,4 +1,4 @@
-From d8bf22111250427ec82a7918528346c714d39e24 Mon Sep 17 00:00:00 2001
+From 139fca7bcfd8aaa876636ff7c50f319028027073 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
@@ -116,5 +116,5 @@ index b3294287bce1..2936fdae823c 100644
  		snprintf(filename, sizeof(filename), "%s/%s/%s",
  			 dir, ar->board_name, file);
 -- 
-2.48.1
+2.49.0
 

+ 12 - 12
patches/6.13-fedora/0005-ipts.patch

@@ -1,4 +1,4 @@
-From 6b36fb0eff720194a680dd6d66fee5c47acff46c Mon Sep 17 00:00:00 2001
+From a7b5a85b385d7beabbb4f01f8bd2bcfcfcdffb4e 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] mei: me: Add Icelake device ID for iTouch
@@ -11,7 +11,7 @@ Patchset: ipts
  2 files changed, 2 insertions(+)
 
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index c3a6657dcd4a..82eef2f4eb0a 100644
+index a5f88ec97df7..e379dc2373b5 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -92,6 +92,7 @@
@@ -23,7 +23,7 @@ index c3a6657dcd4a..82eef2f4eb0a 100644
  
  #define MEI_DEV_ID_JSP_N      0x4DE0  /* Jasper Lake Point N */
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 6589635f8ba3..a1df48a434e2 100644
+index d6ff9d82ae94..a1b714505f43 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -97,6 +97,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@@ -35,9 +35,9 @@ index 6589635f8ba3..a1df48a434e2 100644
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 -- 
-2.48.1
+2.49.0
 
-From 468c032c6956af12d83aa0c7d86e2fd1a47221f3 Mon Sep 17 00:00:00 2001
+From 139a811cea8c408bc37e58b26cd593853f3efa64 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: Use IOMMU passthrough mode for IPTS
@@ -142,9 +142,9 @@ index 9ab5371c3538..1839a831a89f 100644
  {
  	if (risky_device(dev))
 -- 
-2.48.1
+2.49.0
 
-From 3e0542848e2fc70847d83533e082ab9cbc46d711 Mon Sep 17 00:00:00 2001
+From 7e49c5f2dce59ad34df0a3a9d01d17bf2e30771f 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
@@ -211,10 +211,10 @@ Patchset: ipts
  create mode 100644 drivers/hid/ipts/thread.h
 
 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index c57927529f8a..9aabcf4241c6 100644
+index b7e010c384ba..d36a55e58598 100644
 --- a/drivers/hid/Kconfig
 +++ b/drivers/hid/Kconfig
-@@ -1388,4 +1388,6 @@ source "drivers/hid/surface-hid/Kconfig"
+@@ -1389,4 +1389,6 @@ source "drivers/hid/surface-hid/Kconfig"
  
  source "drivers/hid/intel-thc-hid/Kconfig"
  
@@ -222,10 +222,10 @@ index c57927529f8a..9aabcf4241c6 100644
 +
  endif # HID_SUPPORT
 diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index 482b096eea28..2024681e72fb 100644
+index 0abfe51704a0..c86c9e80d225 100644
 --- a/drivers/hid/Makefile
 +++ b/drivers/hid/Makefile
-@@ -173,3 +173,5 @@ obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
+@@ -172,3 +172,5 @@ obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
  obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/
  
  obj-$(CONFIG_INTEL_THC_HID)     += intel-thc-hid/
@@ -3237,5 +3237,5 @@ index 000000000000..1f966b8b32c4
 +
 +#endif /* IPTS_THREAD_H */
 -- 
-2.48.1
+2.49.0
 

+ 8 - 8
patches/6.13-fedora/0006-ithc.patch

@@ -1,4 +1,4 @@
-From acb1100081559166a23b76a7151b958f0b43a740 Mon Sep 17 00:00:00 2001
+From 7dbcb0c475dacbbaec0ae72c3c74c8d3087109e6 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 466c1412dd45..565686813588 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.48.1
+2.49.0
 
-From 860404c8e0c0789f6dcc29cb82ff913a9276bd63 Mon Sep 17 00:00:00 2001
+From 9af03ac81e7098a54bf697e915d5a4163fba65bd Mon Sep 17 00:00:00 2001
 From: quo <tuple@list.ru>
 Date: Sun, 11 Dec 2022 12:10:54 +0100
 Subject: [PATCH] hid: Add support for Intel Touch Host Controller
@@ -86,10 +86,10 @@ Patchset: ithc
  create mode 100644 drivers/hid/ithc/ithc.h
 
 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 9aabcf4241c6..f7ee006bff6d 100644
+index d36a55e58598..ff709b2cb72b 100644
 --- a/drivers/hid/Kconfig
 +++ b/drivers/hid/Kconfig
-@@ -1390,4 +1390,6 @@ source "drivers/hid/intel-thc-hid/Kconfig"
+@@ -1391,4 +1391,6 @@ source "drivers/hid/intel-thc-hid/Kconfig"
  
  source "drivers/hid/ipts/Kconfig"
  
@@ -97,10 +97,10 @@ index 9aabcf4241c6..f7ee006bff6d 100644
 +
  endif # HID_SUPPORT
 diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index 2024681e72fb..f5dcee37fe8a 100644
+index c86c9e80d225..046eb5fd8017 100644
 --- a/drivers/hid/Makefile
 +++ b/drivers/hid/Makefile
-@@ -175,3 +175,4 @@ obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/
+@@ -174,3 +174,4 @@ obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/
  obj-$(CONFIG_INTEL_THC_HID)     += intel-thc-hid/
  
  obj-$(CONFIG_HID_IPTS)          += ipts/
@@ -2767,5 +2767,5 @@ index 000000000000..aec320d4e945
 +int ithc_reset(struct ithc *ithc);
 +
 -- 
-2.48.1
+2.49.0
 

+ 30 - 42
patches/6.13-fedora/0007-surface-sam.patch

@@ -1,44 +1,4 @@
-From 1c5d9203a4fc782d1934187ccb6e454a6a110b9c Mon Sep 17 00:00:00 2001
-From: Lukas <lukas.hetzenecker@gmail.com>
-Date: Sat, 8 Mar 2025 22:00:46 +0100
-Subject: [PATCH] platform/surface: aggregator_registry: Add support for
- Surface Pro 11
-
-Add Support for the Surface Pro 11. As the SAM clients are equivalent to
-the Surface Pro 9, reuse its nodes.
-
-Patchset: surface-sam
----
- drivers/platform/surface/surface_aggregator_registry.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index d4f32ad66530..08b4ef382fab 100644
---- a/drivers/platform/surface/surface_aggregator_registry.c
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
-@@ -371,7 +371,7 @@ static const struct software_node *ssam_node_group_sp8[] = {
- 	NULL,
- };
- 
--/* Devices for Surface Pro 9 (Intel/x86) and 10 */
-+/* Devices for Surface Pro 9 (Intel/x86), 10 and 11 */
- static const struct software_node *ssam_node_group_sp9[] = {
- 	&ssam_node_root,
- 	&ssam_node_hub_kip,
-@@ -430,6 +430,9 @@ static const struct acpi_device_id ssam_platform_hub_acpi_match[] = {
- 	/* Surface Pro 10 */
- 	{ "MSHW0510", (unsigned long)ssam_node_group_sp9 },
- 
-+        /* Surface Pro 11 */
-+        { "MSHW0583", (unsigned long)ssam_node_group_sp9 },
-+
- 	/* Surface Book 2 */
- 	{ "MSHW0107", (unsigned long)ssam_node_group_gen5 },
- 
--- 
-2.48.1
-
-From 6250d3bbd6a70dbbbb44856314facc9649f3784c Mon Sep 17 00:00:00 2001
+From a0fe196b68e1a7fc549f760b547aee3ca1dea10c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 17 Jun 2022 02:14:00 +0200
 Subject: [PATCH] rtc: Add basic support for RTC via Surface System Aggregator
@@ -219,5 +179,33 @@ index 000000000000..f6c17c4e98d5
 +MODULE_DESCRIPTION("RTC driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.48.1
+2.49.0
+
+From 92d3a8b58b89ed089e53517d1774f5670f7af4ab Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 20 Apr 2025 01:05:14 +0200
+Subject: [PATCH] platform/surface: aggregator_registry: Add Surface Laptop 7
+ (ACPI)
+
+Patchset: surface-sam
+---
+ drivers/platform/surface/surface_aggregator_registry.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index a594d5fcfcfd..07b03aa4fa7f 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -460,6 +460,9 @@ static const struct acpi_device_id ssam_platform_hub_acpi_match[] = {
+ 	/* Surface Laptop 6 */
+ 	{ "MSHW0530", (unsigned long)ssam_node_group_sl6 },
+ 
++	/* Surface Laptop 7 */
++	{ "MSHW0551", (unsigned long)ssam_node_group_sl7 },
++
+ 	/* Surface Laptop Go 1 */
+ 	{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },
+ 
+-- 
+2.49.0
 

+ 4 - 4
patches/6.13-fedora/0008-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 801aead8a7443382f7c4c5ffea712cfda1ad102c Mon Sep 17 00:00:00 2001
+From f98ac023ab5b5b71124de89e18fe82bc425de93e 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
@@ -107,9 +107,9 @@ index d2499f302b50..77ce5ec3dd9e 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.48.1
+2.49.0
 
-From f849b992c262e89b05810602390e41da0e9f185d Mon Sep 17 00:00:00 2001
+From 9bdc6328ce24cd5f739761d2b0c4db257e7378fb 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
@@ -304,5 +304,5 @@ index 000000000000..68db237734a1
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13-fedora/0009-surface-button.patch

@@ -1,4 +1,4 @@
-From 5259336f8461ac0b8d0e625b614d61274e70be09 Mon Sep 17 00:00:00 2001
+From 5f9bc92e987765bd9439c5dd720dad422db3e5c9 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 b8cad415c62c..43b5d56383e3 100644
  
  /*
 -- 
-2.48.1
+2.49.0
 
-From 50d8655cc723db3b6462bfbc4c711694da923ae6 Mon Sep 17 00:00:00 2001
+From 7ed80ee3276381056a25b279e75996aec50d9be0 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 2755601f979c..4240c98ca226 100644
  
  
 -- 
-2.48.1
+2.49.0
 

+ 7 - 7
patches/6.13-fedora/0010-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 0f982a17fd6d3c96be3c3dd066a6250211666984 Mon Sep 17 00:00:00 2001
+From 3199aa309ef61de73c2ec3497f749317b5f9a373 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 027479179f09..ee5a6bf5452d 100644
+index 6926bd639ec6..b08e3d206c31 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
 @@ -223,6 +223,9 @@ static const struct usb_device_id usb_quirk_list[] = {
@@ -37,9 +37,9 @@ index 027479179f09..ee5a6bf5452d 100644
  	{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
  
 -- 
-2.48.1
+2.49.0
 
-From 00663433f93be502d076cb5d66d0ec957ddeff29 Mon Sep 17 00:00:00 2001
+From 48079de103d77441dc589fc95393279dfd37befa 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
@@ -272,9 +272,9 @@ index e50887a6d22c..4ce18f21a141 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.48.1
+2.49.0
 
-From 3d6dc5f4bc862a62c0a1316e066d9d07ca17c4e1 Mon Sep 17 00:00:00 2001
+From bfb737e0a469bc8031f2e6d6007837e569b6fa3f 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
@@ -571,5 +571,5 @@ index 4ce18f21a141..f5e4d52bd2eb 100644
  	unregister_pm_notifier(&td->pm_notifier);
  	del_timer_sync(&td->release_timer);
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13-fedora/0011-surface-shutdown.patch

@@ -1,4 +1,4 @@
-From 222392358de9542132abcb173bfdc1d8a47deee3 Mon Sep 17 00:00:00 2001
+From ae923cbf9f936baf98fd05461fae2f184ab2eafa 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
@@ -93,5 +93,5 @@ index f05903dd7695..d1e38fdaf8bb 100644
  	atomic_t	enable_cnt;	/* pci_enable_device has been called */
  
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13-fedora/0012-surface-gpe.patch

@@ -1,4 +1,4 @@
-From df5ea6881e7fd0d73be29469721377d5ecbc4bd7 Mon Sep 17 00:00:00 2001
+From 0660fd9f54beae759023eba1206bc335a0520456 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 b359413903b1..b4496db79f39 100644
  		.ident = "Surface Book 1",
  		.matches = {
 -- 
-2.48.1
+2.49.0
 

+ 25 - 25
patches/6.13-fedora/0013-cameras.patch

@@ -1,4 +1,4 @@
-From 6675cd092b80f34b8697aa9012855e351eb704db Mon Sep 17 00:00:00 2001
+From c3ad75a88591c4fae17287d81ad262915b995a63 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 d6265ddc87ef..2a5fcdff4d69 100644
  	 * Do not enumerate devices with enumeration_by_parent flag set as
  	 * they will be enumerated by their respective parents.
 -- 
-2.48.1
+2.49.0
 
-From d225b017ed8cadd981353e1cf114cddf79444cfc Mon Sep 17 00:00:00 2001
+From 6cb288a1c01f510952bc52b2bfdfdc995f87df5a 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
@@ -182,9 +182,9 @@ index 1839a831a89f..ebd7aa6b9038 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x34E4, quirk_iommu_ipts);
 -- 
-2.48.1
+2.49.0
 
-From 9c19e6347c9da54ab936be79799c010c06710aa4 Mon Sep 17 00:00:00 2001
+From 6ed7b1d776a5093ef202df1644aaf749d4c59e30 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
@@ -219,9 +219,9 @@ index 81ac4c691963..f453c9043042 100644
  
  	return 0;
 -- 
-2.48.1
+2.49.0
 
-From 46a21f6b29916e6e600eefb53c054bf684c34e49 Mon Sep 17 00:00:00 2001
+From afb5099a5ee3e5687f4950170338997e09c22d6d 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
@@ -243,11 +243,11 @@ Patchset: cameras
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
-index 09fff213b091..ce641eb45de6 100644
+index a80c981caa34..68d0f07dda0c 100644
 --- a/drivers/platform/x86/intel/int3472/discrete.c
 +++ b/drivers/platform/x86/intel/int3472/discrete.c
-@@ -80,12 +80,27 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
- 					  const char *func, u32 polarity)
+@@ -81,12 +81,27 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
+ 					  const char *func, unsigned long gpio_flags)
  {
  	int ret;
 +	const struct acpi_device_id ov7251_ids[] = {
@@ -268,16 +268,16 @@ index 09fff213b091..ce641eb45de6 100644
 +	 */
 +	if (!strcmp(func, "reset") && !acpi_match_device_ids(int3472->sensor, ov7251_ids)) {
 +		func = "enable";
-+		polarity ^= GPIO_ACTIVE_LOW;
++		gpio_flags ^= GPIO_ACTIVE_LOW;
 +	}
 +
  	ret = skl_int3472_fill_gpiod_lookup(&int3472->gpios.table[int3472->n_sensor_gpios],
- 					    agpio, func, polarity);
+ 					    agpio, func, gpio_flags);
  	if (ret)
 -- 
-2.48.1
+2.49.0
 
-From 0a96da6ea51e6117da7bc09ec2b1a4825bf3f1d0 Mon Sep 17 00:00:00 2001
+From 9f64f577e063bc55f0792e86749fae2be3edeb7d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Tue, 21 Mar 2023 13:45:26 +0000
 Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
@@ -314,9 +314,9 @@ index 30f61e04ecaf..9c1292ca8552 100644
  				     V4L2_CID_TEST_PATTERN,
  				     ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
 -- 
-2.48.1
+2.49.0
 
-From 5be6985f9a839a162a69b8cd73345fb77ccceea2 Mon Sep 17 00:00:00 2001
+From d0da4f26a459eccb3dff3e85bf5d4d62b0610815 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Wed, 22 Mar 2023 11:01:42 +0000
 Subject: [PATCH] media: v4l2-core: Acquire privacy led in
@@ -365,9 +365,9 @@ index f19c8adf2c61..923ed1b5ab8b 100644
  	if (ret < 0)
  		goto out_cleanup;
 -- 
-2.48.1
+2.49.0
 
-From d625f41c3c85ffc29c9f11a6040324052edebc0a Mon Sep 17 00:00:00 2001
+From 435c11d00b0daa5b011dc401e38ab209f10bca75 Mon Sep 17 00:00:00 2001
 From: Kate Hsuan <hpa@redhat.com>
 Date: Tue, 21 Mar 2023 23:37:16 +0800
 Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
@@ -406,9 +406,9 @@ index f453c9043042..b8ad6b413e8b 100644
  		for (i = 0; i < board_data->n_gpiod_lookups; i++)
  			gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
 -- 
-2.48.1
+2.49.0
 
-From 26cea0a675dd2392b0fc23d9b1f9633e131e6b6c Mon Sep 17 00:00:00 2001
+From 8f5b49efb0cdf75553a1491e3620955581d369c2 Mon Sep 17 00:00:00 2001
 From: Kate Hsuan <hpa@redhat.com>
 Date: Tue, 21 Mar 2023 23:37:17 +0800
 Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
@@ -447,9 +447,9 @@ index 7807fa329db0..2d2abb25b944 100644
 +
  #endif /* __LINUX_MFD_TPS68470_H */
 -- 
-2.48.1
+2.49.0
 
-From 61c8e3ff365f40be6c82f7e0b9895a60159e2c94 Mon Sep 17 00:00:00 2001
+From 7ade024275c62ea257aa474632534b709d67fafa Mon Sep 17 00:00:00 2001
 From: Kate Hsuan <hpa@redhat.com>
 Date: Tue, 21 Mar 2023 23:37:18 +0800
 Subject: [PATCH] leds: tps68470: Add LED control for tps68470
@@ -698,9 +698,9 @@ index 000000000000..35aeb5db89c8
 +MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.48.1
+2.49.0
 
-From 62551f0c278803ba20e5ecbfe600f49d675d0855 Mon Sep 17 00:00:00 2001
+From a912466b23ce74196341f724384b46957d3a78b2 Mon Sep 17 00:00:00 2001
 From: mojyack <mojyack@gmail.com>
 Date: Tue, 26 Mar 2024 05:55:44 +0900
 Subject: [PATCH] media: i2c: dw9719: fix probe error on surface go 2
@@ -730,5 +730,5 @@ index c626ed845928..0094cfda57ea 100644
  	cci_write(dw9719->regmap, DW9719_CONTROL, 1, &ret);
  
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13-fedora/0014-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 2b479b02392b0a54e6e8c816c43db4f324f7f3da Mon Sep 17 00:00:00 2001
+From f8321346a2cfef4e6fe50b643a81798a96cc8bf6 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 18485170d51b..66d1b9e8aa9d 100644
  	mp_config_acpi_legacy_irqs();
  
 -- 
-2.48.1
+2.49.0
 
-From f92cb8388023fb303b14dfcfb65782834ab4b172 Mon Sep 17 00:00:00 2001
+From 932d58e876e827ce1d705056b0b13c16efdbf427 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 66d1b9e8aa9d..741e05190b41 100644
  };
  
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13-fedora/0015-rtc.patch

@@ -1,4 +1,4 @@
-From b79ca491e86cc6bf4c60988f3dc9a332288340f1 Mon Sep 17 00:00:00 2001
+From 9ae940ef2a162d1175e19fe58451e3681d3cdeeb 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
@@ -106,5 +106,5 @@ index 825c2a8acea4..74612088ac5f 100644
  		ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group);
  		if (ret)
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13/0001-secureboot.patch

@@ -1,4 +1,4 @@
-From 4d009b53e8096425207fc6682b4678264ea70b8e Mon Sep 17 00:00:00 2001
+From 4b43dd2ed91c6e744808726ef85c4926a99bedf5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 9 Jun 2024 19:48:58 +0200
 Subject: [PATCH] Revert "efi/x86: Set the PE/COFF header's NX compat flag
@@ -33,9 +33,9 @@ index b5c79f43359b..a1bbedd989e4 100644
  	.long	0				# SizeOfStackReserve
  	.long	0				# SizeOfStackCommit
 -- 
-2.48.1
+2.49.0
 
-From f8c846bc0fc48b8399ea88427df65e12bf0e44db Mon Sep 17 00:00:00 2001
+From 558331080b6d47dfe55d3a4394fbdf2a3175940b Mon Sep 17 00:00:00 2001
 From: "J. Eduardo" <j.eduardo@gmail.com>
 Date: Sun, 25 Aug 2024 14:17:45 +0200
 Subject: [PATCH] PM: hibernate: Add a lockdown_hibernate parameter
@@ -108,5 +108,5 @@ index 10a01af63a80..e53e4a86e4cc 100644
  __setup("nohibernate", nohibernate_setup);
 +__setup("lockdown_hibernate", lockdown_hibernate_setup);
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13/0002-surface3.patch

@@ -1,4 +1,4 @@
-From 1c36e25e29f59846a44c35a3bb204bfa0663860a Mon Sep 17 00:00:00 2001
+From 1861d3780461b6a1640979f316576342b1a9c990 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,9 +97,9 @@ index e4c3492a0c28..0b930c91bccb 100644
  };
  
 -- 
-2.48.1
+2.49.0
 
-From b14f3b2d0baf0778bb4b1e69a692ae2b21987aec Mon Sep 17 00:00:00 2001
+From d1425f39cb72c625b785ae50b563543f9cdf384b Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Fri, 6 Dec 2019 23:10:30 +0900
 Subject: [PATCH] surface3-spi: workaround: disable DMA mode to avoid crash by
@@ -230,5 +230,5 @@ index 6074b7730e86..6aa3e1d6f160 100644
  }
  
 -- 
-2.48.1
+2.49.0
 

+ 8 - 8
patches/6.13/0003-mwifiex.patch

@@ -1,4 +1,4 @@
-From 29f233ddc5afdf6f36d0049d7ee271445158dbdc Mon Sep 17 00:00:00 2001
+From 9c9103776669669ae724ca844f9ea1c24a3858dd 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.48.1
+2.49.0
 
-From 98097d6f99d54495af0feee4345ed6d92d547e60 Mon Sep 17 00:00:00 2001
+From de88988bb0d5cbe32fabac2241c84c394d988c3d 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.48.1
+2.49.0
 
-From 8d3ba13b4229f989721b335198b56d33ee508552 Mon Sep 17 00:00:00 2001
+From 4abcf78a128e215d638f9718acf11858cd5f278a 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 72e85673b709..110c983dfd53 100644
+index 75dbe07e07e2..fd0f1aa5eaa9 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -65,6 +65,7 @@ static struct usb_driver btusb_driver;
@@ -375,7 +375,7 @@ index 72e85673b709..110c983dfd53 100644
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
-@@ -3869,6 +3871,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -3870,6 +3872,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 72e85673b709..110c983dfd53 100644
  	    (id->driver_info & BTUSB_MEDIATEK)) {
  		hdev->setup = btusb_mtk_setup;
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13/0004-ath10k.patch

@@ -1,4 +1,4 @@
-From fadbf4e719d243db53a4e644515dfd8f2b12198d Mon Sep 17 00:00:00 2001
+From c859f592a5dfe3f04fecbf2be6c6fd470759008e 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
@@ -116,5 +116,5 @@ index b3294287bce1..2936fdae823c 100644
  		snprintf(filename, sizeof(filename), "%s/%s/%s",
  			 dir, ar->board_name, file);
 -- 
-2.48.1
+2.49.0
 

+ 12 - 12
patches/6.13/0005-ipts.patch

@@ -1,4 +1,4 @@
-From fc8b194519d2c8fd64a374ad5ca03b8d5cd0cf34 Mon Sep 17 00:00:00 2001
+From 9afe48759efd50b5a28f2e01118464a72f1cfb70 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] mei: me: Add Icelake device ID for iTouch
@@ -11,7 +11,7 @@ Patchset: ipts
  2 files changed, 2 insertions(+)
 
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index c3a6657dcd4a..82eef2f4eb0a 100644
+index a5f88ec97df7..e379dc2373b5 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -92,6 +92,7 @@
@@ -23,7 +23,7 @@ index c3a6657dcd4a..82eef2f4eb0a 100644
  
  #define MEI_DEV_ID_JSP_N      0x4DE0  /* Jasper Lake Point N */
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 6589635f8ba3..a1df48a434e2 100644
+index d6ff9d82ae94..a1b714505f43 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -97,6 +97,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@@ -35,9 +35,9 @@ index 6589635f8ba3..a1df48a434e2 100644
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 -- 
-2.48.1
+2.49.0
 
-From 75bd5dd5e9bb6724c24a8574ef33462be36574b5 Mon Sep 17 00:00:00 2001
+From 0e2a5e55b467f538bdf2ec6c91c4b7aa36fc083f 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: Use IOMMU passthrough mode for IPTS
@@ -142,9 +142,9 @@ index 9ab5371c3538..1839a831a89f 100644
  {
  	if (risky_device(dev))
 -- 
-2.48.1
+2.49.0
 
-From c1562dcece75359bcc519d9a034f30fbe2c61f14 Mon Sep 17 00:00:00 2001
+From bed448bd281fe2969f17049a5a2192d1e5374618 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
@@ -211,10 +211,10 @@ Patchset: ipts
  create mode 100644 drivers/hid/ipts/thread.h
 
 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 4d2a89d65b65..ce8e61de72c7 100644
+index 363c860835d3..799aceeeea89 100644
 --- a/drivers/hid/Kconfig
 +++ b/drivers/hid/Kconfig
-@@ -1386,4 +1386,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
+@@ -1387,4 +1387,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
  
  source "drivers/hid/surface-hid/Kconfig"
  
@@ -222,10 +222,10 @@ index 4d2a89d65b65..ce8e61de72c7 100644
 +
  endif # HID_SUPPORT
 diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index 24de45f3677d..c33ea76797a7 100644
+index 1f50a6ecadbb..b82016429b01 100644
 --- a/drivers/hid/Makefile
 +++ b/drivers/hid/Makefile
-@@ -171,3 +171,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER)	+= intel-ish-hid/
+@@ -170,3 +170,5 @@ obj-$(CONFIG_INTEL_ISH_HID)	+= intel-ish-hid/
  obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
  
  obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/
@@ -3237,5 +3237,5 @@ index 000000000000..1f966b8b32c4
 +
 +#endif /* IPTS_THREAD_H */
 -- 
-2.48.1
+2.49.0
 

+ 8 - 8
patches/6.13/0006-ithc.patch

@@ -1,4 +1,4 @@
-From 761d58754af7780fa1fbc39764a8b944478aefa7 Mon Sep 17 00:00:00 2001
+From bccd64f261b835edd1abfc24c2f6ec170fb54728 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 466c1412dd45..565686813588 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.48.1
+2.49.0
 
-From 4a1179f85e091a21417cc81b5e3813dbcc996107 Mon Sep 17 00:00:00 2001
+From 4ad821daf98ea471e649a4c7e5be4c4ea140000b Mon Sep 17 00:00:00 2001
 From: quo <tuple@list.ru>
 Date: Sun, 11 Dec 2022 12:10:54 +0100
 Subject: [PATCH] hid: Add support for Intel Touch Host Controller
@@ -86,10 +86,10 @@ Patchset: ithc
  create mode 100644 drivers/hid/ithc/ithc.h
 
 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index ce8e61de72c7..db6665977a32 100644
+index 799aceeeea89..8b09289cbe8a 100644
 --- a/drivers/hid/Kconfig
 +++ b/drivers/hid/Kconfig
-@@ -1388,4 +1388,6 @@ source "drivers/hid/surface-hid/Kconfig"
+@@ -1389,4 +1389,6 @@ source "drivers/hid/surface-hid/Kconfig"
  
  source "drivers/hid/ipts/Kconfig"
  
@@ -97,10 +97,10 @@ index ce8e61de72c7..db6665977a32 100644
 +
  endif # HID_SUPPORT
 diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index c33ea76797a7..6a89c1eb1b19 100644
+index b82016429b01..9ac9e13ad64c 100644
 --- a/drivers/hid/Makefile
 +++ b/drivers/hid/Makefile
-@@ -173,3 +173,4 @@ obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
+@@ -172,3 +172,4 @@ obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
  obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/
  
  obj-$(CONFIG_HID_IPTS)          += ipts/
@@ -2767,5 +2767,5 @@ index 000000000000..aec320d4e945
 +int ithc_reset(struct ithc *ithc);
 +
 -- 
-2.48.1
+2.49.0
 

+ 30 - 42
patches/6.13/0007-surface-sam.patch

@@ -1,44 +1,4 @@
-From f380056e3a34dd28350a41869034943fe78d0041 Mon Sep 17 00:00:00 2001
-From: Lukas <lukas.hetzenecker@gmail.com>
-Date: Sat, 8 Mar 2025 22:00:46 +0100
-Subject: [PATCH] platform/surface: aggregator_registry: Add support for
- Surface Pro 11
-
-Add Support for the Surface Pro 11. As the SAM clients are equivalent to
-the Surface Pro 9, reuse its nodes.
-
-Patchset: surface-sam
----
- drivers/platform/surface/surface_aggregator_registry.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index d4f32ad66530..08b4ef382fab 100644
---- a/drivers/platform/surface/surface_aggregator_registry.c
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
-@@ -371,7 +371,7 @@ static const struct software_node *ssam_node_group_sp8[] = {
- 	NULL,
- };
- 
--/* Devices for Surface Pro 9 (Intel/x86) and 10 */
-+/* Devices for Surface Pro 9 (Intel/x86), 10 and 11 */
- static const struct software_node *ssam_node_group_sp9[] = {
- 	&ssam_node_root,
- 	&ssam_node_hub_kip,
-@@ -430,6 +430,9 @@ static const struct acpi_device_id ssam_platform_hub_acpi_match[] = {
- 	/* Surface Pro 10 */
- 	{ "MSHW0510", (unsigned long)ssam_node_group_sp9 },
- 
-+        /* Surface Pro 11 */
-+        { "MSHW0583", (unsigned long)ssam_node_group_sp9 },
-+
- 	/* Surface Book 2 */
- 	{ "MSHW0107", (unsigned long)ssam_node_group_gen5 },
- 
--- 
-2.48.1
-
-From 0fb14f0e1961e47fed10351be0793d44708ea3ad Mon Sep 17 00:00:00 2001
+From 743c35534434dc42eecd818a5d6d02f33032f2f7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 17 Jun 2022 02:14:00 +0200
 Subject: [PATCH] rtc: Add basic support for RTC via Surface System Aggregator
@@ -219,5 +179,33 @@ index 000000000000..f6c17c4e98d5
 +MODULE_DESCRIPTION("RTC driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.48.1
+2.49.0
+
+From 47fccc8a7d20139c64577c160bc56eaf4bc2b953 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 20 Apr 2025 01:05:14 +0200
+Subject: [PATCH] platform/surface: aggregator_registry: Add Surface Laptop 7
+ (ACPI)
+
+Patchset: surface-sam
+---
+ drivers/platform/surface/surface_aggregator_registry.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index a594d5fcfcfd..07b03aa4fa7f 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -460,6 +460,9 @@ static const struct acpi_device_id ssam_platform_hub_acpi_match[] = {
+ 	/* Surface Laptop 6 */
+ 	{ "MSHW0530", (unsigned long)ssam_node_group_sl6 },
+ 
++	/* Surface Laptop 7 */
++	{ "MSHW0551", (unsigned long)ssam_node_group_sl7 },
++
+ 	/* Surface Laptop Go 1 */
+ 	{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },
+ 
+-- 
+2.49.0
 

+ 4 - 4
patches/6.13/0008-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 28db0098e37b9ac1e261afd935c0e2c5e0ae3675 Mon Sep 17 00:00:00 2001
+From b31805e73ebae15726da67431317007ff11e91df 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
@@ -107,9 +107,9 @@ index d2499f302b50..77ce5ec3dd9e 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.48.1
+2.49.0
 
-From d7f160e91330f15f3ce5806dd2eeda08b67683e6 Mon Sep 17 00:00:00 2001
+From 1383dcb9227a733f83c4a5f5fb266ade3eab27c8 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
@@ -304,5 +304,5 @@ index 000000000000..68db237734a1
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13/0009-surface-button.patch

@@ -1,4 +1,4 @@
-From cee06c726d818a4194f543f2fc99f69ed0a4a1ae Mon Sep 17 00:00:00 2001
+From 36744fee38cc8c3674e53a6a0521db8f84bf9ea1 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 b8cad415c62c..43b5d56383e3 100644
  
  /*
 -- 
-2.48.1
+2.49.0
 
-From 2b8ce3b47ac424db0c4ac408c8122ccc494aa6ae Mon Sep 17 00:00:00 2001
+From 4bd976ecb12b42aa6b88924078a81cb42d8476a9 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 2755601f979c..4240c98ca226 100644
  
  
 -- 
-2.48.1
+2.49.0
 

+ 7 - 7
patches/6.13/0010-surface-typecover.patch

@@ -1,4 +1,4 @@
-From db94df7d6a30c9c4125013bd195ec41d4b04a379 Mon Sep 17 00:00:00 2001
+From 0409e9b3f615228d69485901cbcf251c830387a6 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 027479179f09..ee5a6bf5452d 100644
+index 6926bd639ec6..b08e3d206c31 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
 @@ -223,6 +223,9 @@ static const struct usb_device_id usb_quirk_list[] = {
@@ -37,9 +37,9 @@ index 027479179f09..ee5a6bf5452d 100644
  	{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
  
 -- 
-2.48.1
+2.49.0
 
-From d9c734fac1446ce245a98a5f592060cc20edb158 Mon Sep 17 00:00:00 2001
+From e240ca7b5b78037f573916c0e8c5fd7cffb07613 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
@@ -272,9 +272,9 @@ index e50887a6d22c..4ce18f21a141 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.48.1
+2.49.0
 
-From 3e36c4a010af0175b6537a3e9b5f413e95105583 Mon Sep 17 00:00:00 2001
+From 09ee792ac8f01560084e2dad8eeaf7a4296dd850 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
@@ -571,5 +571,5 @@ index 4ce18f21a141..f5e4d52bd2eb 100644
  	unregister_pm_notifier(&td->pm_notifier);
  	del_timer_sync(&td->release_timer);
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13/0011-surface-shutdown.patch

@@ -1,4 +1,4 @@
-From 4f1f9492b46f9eee2ce9f844e03722acefaf5089 Mon Sep 17 00:00:00 2001
+From a8fd28a346634ae41963cabaa22c249c66289cf6 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
@@ -93,5 +93,5 @@ index f05903dd7695..d1e38fdaf8bb 100644
  	atomic_t	enable_cnt;	/* pci_enable_device has been called */
  
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13/0012-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 424492cfdcccf128c28222d3bb3ba3f2ee05e3bd Mon Sep 17 00:00:00 2001
+From b7ce7965f7676337a02f806cc57d3dec2ebfc946 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 b359413903b1..b4496db79f39 100644
  		.ident = "Surface Book 1",
  		.matches = {
 -- 
-2.48.1
+2.49.0
 

+ 25 - 25
patches/6.13/0013-cameras.patch

@@ -1,4 +1,4 @@
-From eff5ad8dccd6f5a16bccaf8dff294af5d429e8ad Mon Sep 17 00:00:00 2001
+From 027ae0a6a7af6791b208eab02e2903d7584ebe2f 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 74dcccdc6482..9b104f979abe 100644
  	 * Do not enumerate devices with enumeration_by_parent flag set as
  	 * they will be enumerated by their respective parents.
 -- 
-2.48.1
+2.49.0
 
-From fac80ec3139641ff4c494e7cd09d1648c7d8b2be Mon Sep 17 00:00:00 2001
+From 0df5096c55f417ba51e40b7e094b0e1fcfb9162f 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
@@ -182,9 +182,9 @@ index 1839a831a89f..ebd7aa6b9038 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x34E4, quirk_iommu_ipts);
 -- 
-2.48.1
+2.49.0
 
-From f451c52ee26ece5d7019766e438a981ef6fe112c Mon Sep 17 00:00:00 2001
+From 11180426d5fe34b886682a7f2bbe8c061502c312 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
@@ -219,9 +219,9 @@ index 81ac4c691963..f453c9043042 100644
  
  	return 0;
 -- 
-2.48.1
+2.49.0
 
-From 04c30b68d29d35c3f1648919d191249b17f0b487 Mon Sep 17 00:00:00 2001
+From ab154f95bf4acaf98a5732c1efceeb9fa602f6c8 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
@@ -243,11 +243,11 @@ Patchset: cameras
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
-index 09fff213b091..ce641eb45de6 100644
+index a80c981caa34..68d0f07dda0c 100644
 --- a/drivers/platform/x86/intel/int3472/discrete.c
 +++ b/drivers/platform/x86/intel/int3472/discrete.c
-@@ -80,12 +80,27 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
- 					  const char *func, u32 polarity)
+@@ -81,12 +81,27 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
+ 					  const char *func, unsigned long gpio_flags)
  {
  	int ret;
 +	const struct acpi_device_id ov7251_ids[] = {
@@ -268,16 +268,16 @@ index 09fff213b091..ce641eb45de6 100644
 +	 */
 +	if (!strcmp(func, "reset") && !acpi_match_device_ids(int3472->sensor, ov7251_ids)) {
 +		func = "enable";
-+		polarity ^= GPIO_ACTIVE_LOW;
++		gpio_flags ^= GPIO_ACTIVE_LOW;
 +	}
 +
  	ret = skl_int3472_fill_gpiod_lookup(&int3472->gpios.table[int3472->n_sensor_gpios],
- 					    agpio, func, polarity);
+ 					    agpio, func, gpio_flags);
  	if (ret)
 -- 
-2.48.1
+2.49.0
 
-From 45854373b2c865431add3e249e42090cb2412057 Mon Sep 17 00:00:00 2001
+From fe2b7efab5d7a89b0335daf29d72bb08b853c4d7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Tue, 21 Mar 2023 13:45:26 +0000
 Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
@@ -314,9 +314,9 @@ index 30f61e04ecaf..9c1292ca8552 100644
  				     V4L2_CID_TEST_PATTERN,
  				     ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
 -- 
-2.48.1
+2.49.0
 
-From 7ae7dc83e5f08fafe78b6737b3d1ac6aa1c932a1 Mon Sep 17 00:00:00 2001
+From 56d08f849ecd0a3f0a801a4ac7e90d757528bf0c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Wed, 22 Mar 2023 11:01:42 +0000
 Subject: [PATCH] media: v4l2-core: Acquire privacy led in
@@ -365,9 +365,9 @@ index f19c8adf2c61..923ed1b5ab8b 100644
  	if (ret < 0)
  		goto out_cleanup;
 -- 
-2.48.1
+2.49.0
 
-From d20654efdf6f940456501405e90e3ed096a64258 Mon Sep 17 00:00:00 2001
+From ba92bf1c2ccef5492906f74cc2be3f0f583032fa Mon Sep 17 00:00:00 2001
 From: Kate Hsuan <hpa@redhat.com>
 Date: Tue, 21 Mar 2023 23:37:16 +0800
 Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
@@ -406,9 +406,9 @@ index f453c9043042..b8ad6b413e8b 100644
  		for (i = 0; i < board_data->n_gpiod_lookups; i++)
  			gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
 -- 
-2.48.1
+2.49.0
 
-From b46660642fed87df97974c1eb864bff34cb5f67c Mon Sep 17 00:00:00 2001
+From ac2829c3ae57463819f0cb28c48eae4147cfa12c Mon Sep 17 00:00:00 2001
 From: Kate Hsuan <hpa@redhat.com>
 Date: Tue, 21 Mar 2023 23:37:17 +0800
 Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
@@ -447,9 +447,9 @@ index 7807fa329db0..2d2abb25b944 100644
 +
  #endif /* __LINUX_MFD_TPS68470_H */
 -- 
-2.48.1
+2.49.0
 
-From 6771f76a6415179f12d68c24f599405f2ac939f1 Mon Sep 17 00:00:00 2001
+From 9f5b3820f1dd06d363ed73ef3997a63e218516bd Mon Sep 17 00:00:00 2001
 From: Kate Hsuan <hpa@redhat.com>
 Date: Tue, 21 Mar 2023 23:37:18 +0800
 Subject: [PATCH] leds: tps68470: Add LED control for tps68470
@@ -698,9 +698,9 @@ index 000000000000..35aeb5db89c8
 +MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.48.1
+2.49.0
 
-From b00c21087ed9b70395b20328c11f2b43f4e07a99 Mon Sep 17 00:00:00 2001
+From 8766d0105b72c4c1f4fe9a36eb872cc2b3879c10 Mon Sep 17 00:00:00 2001
 From: mojyack <mojyack@gmail.com>
 Date: Tue, 26 Mar 2024 05:55:44 +0900
 Subject: [PATCH] media: i2c: dw9719: fix probe error on surface go 2
@@ -730,5 +730,5 @@ index c626ed845928..0094cfda57ea 100644
  	cci_write(dw9719->regmap, DW9719_CONTROL, 1, &ret);
  
 -- 
-2.48.1
+2.49.0
 

+ 4 - 4
patches/6.13/0014-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 04e4e3bd36af14f0d6d9eabbfd9b6090247e4eba Mon Sep 17 00:00:00 2001
+From 944244c44f80d631fff8058b0d9692dfd761b4f4 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 18485170d51b..66d1b9e8aa9d 100644
  	mp_config_acpi_legacy_irqs();
  
 -- 
-2.48.1
+2.49.0
 
-From 438f8d54a08f27470165575040d3ee51cd943e52 Mon Sep 17 00:00:00 2001
+From 6c65b07967d9f713c87103cdfe80c1ded559f154 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 66d1b9e8aa9d..741e05190b41 100644
  };
  
 -- 
-2.48.1
+2.49.0
 

+ 2 - 2
patches/6.13/0015-rtc.patch

@@ -1,4 +1,4 @@
-From 8b87bc2d8d00488493dc389fe768d6f9ad034fff Mon Sep 17 00:00:00 2001
+From 0600ea617b539cd7a04249b896ebdc28b43717b0 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
@@ -106,5 +106,5 @@ index 825c2a8acea4..74612088ac5f 100644
  		ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group);
  		if (ret)
 -- 
-2.48.1
+2.49.0