فهرست منبع

Update v5.18 patches

Changes:
 - Rebase onto v5.18.18

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/2de76eee3bcf9012444007399852fcf33a5d8d4a
Maximilian Luz 2 سال پیش
والد
کامیت
ef12afe206

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

@@ -1,4 +1,4 @@
-From e41a4aa437f1641bcf8570a52ae0722f1c1f4abf Mon Sep 17 00:00:00 2001
+From c6e3f1bc77076f24fd65fabf5daedc27d113c547 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
@@ -97,5 +97,5 @@ index 6beb00858c33..d82d77387a0a 100644
  };
  
 -- 
-2.37.1
+2.37.2
 

+ 14 - 14
patches/5.18/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 8b4a537282d5e6132eb707d72fedf86af7b85a33 Mon Sep 17 00:00:00 2001
+From 5fd4fa4e0125e6047deecd25e5bcfb267e803af6 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:32:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@@ -181,9 +181,9 @@ index 8ec4176d698f..25370c5a4f59 100644
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 +int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
 -- 
-2.37.1
+2.37.2
 
-From 7ff76e620239855e35844db8cadb6c31a938b817 Mon Sep 17 00:00:00 2001
+From e8938ddf37c21a79376be890bc7898e6c39351e0 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Wed, 30 Sep 2020 18:08:24 +0900
 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@@ -243,9 +243,9 @@ index 563dd0d5ac79..32e2f000e57b 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From d2b61ab89ea452d993ee8e1a5030d1b5a70c0313 Mon Sep 17 00:00:00 2001
+From fa33af74c0ab3047b79a0c7f4c00bf9f277d29de Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -398,9 +398,9 @@ index 25370c5a4f59..a1de111ad1db 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.37.1
+2.37.2
 
-From 2f82a96343c68cb620bfefc7b6b5232eab6616a7 Mon Sep 17 00:00:00 2001
+From ada9adf937ff19d9eaaf43980f88715e8543480c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 3 Nov 2020 13:28:04 +0100
 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@@ -565,9 +565,9 @@ index a1de111ad1db..0e429779bb04 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.37.1
+2.37.2
 
-From 2330ec7782b8e8f8ac7b05e1ddf6de17ff8f286e Mon Sep 17 00:00:00 2001
+From 18ba817428297818c766791748efb3c54b588476 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
@@ -603,7 +603,7 @@ Patchset: mwifiex
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index e48c3ad069bb..d7704d4e568d 100644
+index d789c077d95d..feda593a8a83 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -63,6 +63,7 @@ static struct usb_driver btusb_driver;
@@ -622,7 +622,7 @@ index e48c3ad069bb..d7704d4e568d 100644
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
-@@ -3775,6 +3777,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -3790,6 +3792,19 @@ static int btusb_probe(struct usb_interface *intf,
  	if (id->driver_info & BTUSB_MARVELL)
  		hdev->set_bdaddr = btusb_set_bdaddr_marvell;
  
@@ -643,9 +643,9 @@ index e48c3ad069bb..d7704d4e568d 100644
  	    (id->driver_info & BTUSB_MEDIATEK)) {
  		hdev->setup = btusb_mtk_setup;
 -- 
-2.37.1
+2.37.2
 
-From f928989345921d313ac80c2d3202ad0f98523150 Mon Sep 17 00:00:00 2001
+From 002a63959850db74750e3f7323ca39fd83ea9436 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 10 Nov 2020 12:49:56 +0100
 Subject: [PATCH] mwifiex: Use non-posted PCI register writes
@@ -700,5 +700,5 @@ index 24bcd22a2618..b4ad0113a035 100644
  }
  
 -- 
-2.37.1
+2.37.2
 

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

@@ -1,4 +1,4 @@
-From b7959ca0ee4ff6694df5be8319b2b5bcf04f63e3 Mon Sep 17 00:00:00 2001
+From 3934eee36afb9f84434891352cb2c8a2b124d9a1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Feb 2021 00:45:52 +0100
 Subject: [PATCH] ath10k: Add module parameters to override board files
@@ -117,5 +117,5 @@ index 9e1f483e1362..34cfce241e4a 100644
  	ret = firmware_request_nowarn(&fw, filename, ar->dev);
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.37.1
+2.37.2
 

+ 6 - 6
patches/5.18/0004-ipts.patch

@@ -1,4 +1,4 @@
-From eed9174d259087d037b0a24299e6e9756b5a891d Mon Sep 17 00:00:00 2001
+From 343bbe8435d603e410c1f2d2756757d39ca20295 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 30 Jul 2020 13:21:53 +0200
 Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@@ -34,9 +34,9 @@ index 5435604327a7..1165ee4f5928 100644
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 -- 
-2.37.1
+2.37.2
 
-From 93e99818e0efa9cafa49870d13acb9ea4d59687b Mon Sep 17 00:00:00 2001
+From c53f690f596e9009c18e1677337983b21b15f83e Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 6 Aug 2020 11:20:41 +0200
 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus
@@ -1499,9 +1499,9 @@ index 000000000000..53fb86a88f97
 +
 +#endif /* _IPTS_UAPI_H_ */
 -- 
-2.37.1
+2.37.2
 
-From 1afc4d0acaf3dae8099a5629324e7e8a71c7eb19 Mon Sep 17 00:00:00 2001
+From ba3d78eac41ed4d6be1de1f235e97bd932864162 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
@@ -1599,5 +1599,5 @@ index c7ec5177cf78..7f3699e19270 100644
  {
  	if (risky_device(dev))
 -- 
-2.37.1
+2.37.2
 

+ 52 - 52
patches/5.18/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From c778e89d1a838df8c3f58495eaae7f479942a684 Mon Sep 17 00:00:00 2001
+From 17f1e21d9b782aa7d25a446b3663b72c055fd7d7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:36 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow is_ssam_device() to be
@@ -53,9 +53,9 @@ index cc257097eb05..62b38b4487eb 100644
   * to_ssam_device() - Casts the given device to a SSAM client device.
   * @d: The device to cast.
 -- 
-2.37.1
+2.37.2
 
-From 020539d0ce46c61271161500d319b914b758eded Mon Sep 17 00:00:00 2001
+From 64ea57d5ed105ab1a046ed0ca5f0ad3f29470101 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:37 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow devices to be marked as
@@ -162,9 +162,9 @@ index 62b38b4487eb..6df7c8d4e50e 100644
   * ssam_device_get() - Increment reference count of SSAM client device.
   * @sdev: The device to increment the reference count of.
 -- 
-2.37.1
+2.37.2
 
-From 785b34307feda7a15dbe26a7eac91fb290995ae8 Mon Sep 17 00:00:00 2001
+From 66750927a15616256b0e57fad5952d857ceea0cc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:38 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow notifiers to avoid
@@ -458,9 +458,9 @@ index 6df7c8d4e50e..c418f7f2732d 100644
 +
  #endif /* _LINUX_SURFACE_AGGREGATOR_DEVICE_H */
 -- 
-2.37.1
+2.37.2
 
-From b6812b30429d9ee185390d2e412c3d0369eefcfb Mon Sep 17 00:00:00 2001
+From 6418fed20ac4e1540a8747b3799f48b69ec86c8c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:39 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Use client device
@@ -510,9 +510,9 @@ index ce2bd88feeaa..9f630e890ff7 100644
  	ssam_remove_clients(&sdev->dev);
  }
 -- 
-2.37.1
+2.37.2
 
-From b444ed931131fa1a43e214e5640886ed1fc20112 Mon Sep 17 00:00:00 2001
+From 7c680b78726f4dcfb1d2714d55d68fc6ea4ac0b8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:40 +0200
 Subject: [PATCH] power/supply: surface_charger: Use client device wrappers for
@@ -554,9 +554,9 @@ index a060c36c7766..59182d55742d 100644
  
  static const struct spwr_psy_properties spwr_psy_props_adp1 = {
 -- 
-2.37.1
+2.37.2
 
-From 2da41fb33be7f8c013fe380b2723cdf396097e1b Mon Sep 17 00:00:00 2001
+From c4a286e4b15803af7d9b7e893ba3ce86d785ad86 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:41 +0200
 Subject: [PATCH] power/supply: surface_battery: Use client device wrappers for
@@ -598,9 +598,9 @@ index 5ec2e6bb2465..540707882bb0 100644
  }
  
 -- 
-2.37.1
+2.37.2
 
-From 4f378f9e581fa843e9c759d0a40a387ea1cd47e1 Mon Sep 17 00:00:00 2001
+From a76ab65a0845e951c6614ff9ab78ced2488e49b1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:42 +0200
 Subject: [PATCH] HID: surface-hid: Add support for hot-removal
@@ -712,9 +712,9 @@ index e46330b2e561..87637f813de2 100644
  		return shid->ops.output_report(shid, reportnum, buf, len);
  
 -- 
-2.37.1
+2.37.2
 
-From 5e680f1187a991bd0812561e99ef348452746e48 Mon Sep 17 00:00:00 2001
+From 65dd92ca9f5b7871e5c49040c2155d2e341e1039 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:43 +0200
 Subject: [PATCH] platform/surface: aggregator: Add comment for KIP subsystem
@@ -753,9 +753,9 @@ index c3de43edcffa..26b95ec12733 100644
  	SSAM_SSH_TC_BLD = 0x10,
  	SSAM_SSH_TC_BAS = 0x11,	/* Detachment system (Surface Book 2/3). */
 -- 
-2.37.1
+2.37.2
 
-From 611104a812f02db3142f46bc080d013364c9240e Mon Sep 17 00:00:00 2001
+From c46d674b2876bb2ad81c649ac4d6c2fe182cc262 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:44 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Generify subsystem hub
@@ -1143,9 +1143,9 @@ index 9f630e890ff7..09cbeee2428b 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From 109787d6431d2c8fd41db4dc5a2d48745fd9e698 Mon Sep 17 00:00:00 2001
+From d293378f454cb71b55886aeec00c58088e529ca7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:45 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Change device ID for
@@ -1187,9 +1187,9 @@ index 09cbeee2428b..b11ce87c7184 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From 112279aee63d354266cb949907daa6f847773ced Mon Sep 17 00:00:00 2001
+From c4bdb8393081ba9121aadc7d6643a42613fbcbd0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:46 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add KIP device hub
@@ -1352,9 +1352,9 @@ index b11ce87c7184..f15cef60630f 100644
  	platform_driver_unregister(&ssam_platform_hub_driver);
  }
 -- 
-2.37.1
+2.37.2
 
-From 5ea065bd96fe7d78c4804a13e5fd3f346fb390fe Mon Sep 17 00:00:00 2001
+From f4c22cd50fb6eba94141a7823be1d4d4db06eb92 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:47 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -1453,9 +1453,9 @@ index f15cef60630f..bf3303f1aa71 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From c6ccb427e1927979285fcf61d7fb65c01d6cb059 Mon Sep 17 00:00:00 2001
+From 9fbb688836c42161b6389da82442a12ff2346e44 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 14 Jun 2022 13:17:49 +0200
 Subject: [PATCH] platform/surface: aggregator: Reserve more event- and
@@ -1672,9 +1672,9 @@ index 26b95ec12733..45501b6e54e8 100644
  
  
 -- 
-2.37.1
+2.37.2
 
-From 4a49dad02395bb13c84fb39dcd19306509e8df37 Mon Sep 17 00:00:00 2001
+From f26c891671fde07b2b198bc69d36b2c372a0ac55 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 16 Jun 2022 01:50:12 +0200
 Subject: [PATCH] platform/surface: aggregator: Add helper macros for requests
@@ -1882,9 +1882,9 @@ index c418f7f2732d..6cf7e80312d5 100644
  /* -- Helpers for client-device notifiers. ---------------------------------- */
  
 -- 
-2.37.1
+2.37.2
 
-From 0e7736e1faf6bc03eabe5021f32a7ab3caf705be Mon Sep 17 00:00:00 2001
+From b89f2ac538abd4dd449bd9bd84d86e93b5567b38 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 03:19:20 +0200
 Subject: [PATCH] platform/surface: Add KIP tablet-mode switch
@@ -1914,10 +1914,10 @@ Patchset: surface-sam
  create mode 100644 drivers/platform/surface/surface_aggregator_tabletsw.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 2b70e2d21405..cad9449b37e1 100644
+index c7c7a96b62a8..852231f4e469 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13035,6 +13035,12 @@ F:	drivers/scsi/smartpqi/smartpqi*.[ch]
+@@ -13030,6 +13030,12 @@ F:	drivers/scsi/smartpqi/smartpqi*.[ch]
  F:	include/linux/cciss*.h
  F:	include/uapi/linux/cciss*.h
  
@@ -2518,9 +2518,9 @@ index 000000000000..6f402d2ca894
 +MODULE_DESCRIPTION("Tablet mode switch driver for Surface devices using the Surface Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.37.1
+2.37.2
 
-From 827cf74683af903ebc5b74d6611c86521d4dd7c6 Mon Sep 17 00:00:00 2001
+From 14f40e0eba6884c5eb7e71d0852463db08c9d3b1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 27 Oct 2021 22:33:03 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@@ -2568,9 +2568,9 @@ index bf3303f1aa71..8f249df673a4 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From 4cc1a82ccd6789a81ae94766966e627343573b1a Mon Sep 17 00:00:00 2001
+From 41c17d879bc5f5d1700673e7cbb8f1bd4862cafc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 16 Jun 2022 02:30:16 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@@ -2612,9 +2612,9 @@ index 8f249df673a4..f1c5905f1c16 100644
  	&ssam_node_hid_tid1_penstash,
  	&ssam_node_hid_tid1_touchpad,
 -- 
-2.37.1
+2.37.2
 
-From d07ce05e994aa9190be1a31be0b5ab84150cc49d Mon Sep 17 00:00:00 2001
+From 7814ea13e040abe5f2e273865e28f6bd6bc51f17 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:30:46 +0200
 Subject: [PATCH] platform/surface: aggregator: Move device registry helper
@@ -3001,9 +3001,9 @@ index 6cf7e80312d5..6e75fb605479 100644
  /* -- Helpers for client-device requests. ----------------------------------- */
  
 -- 
-2.37.1
+2.37.2
 
-From c4ff779f5f22ee9739fc75dbb9dd9159625847e3 Mon Sep 17 00:00:00 2001
+From 446587a52772adcbdf620ec48d04414f062af173 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:39:56 +0200
 Subject: [PATCH] platform/surface: aggregator: Move subsystem hub drivers to
@@ -3027,10 +3027,10 @@ Patchset: surface-sam
  create mode 100644 drivers/platform/surface/surface_aggregator_hub.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index cad9449b37e1..26bc8bf48b7b 100644
+index 852231f4e469..f96b3dba903a 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13112,6 +13112,12 @@ F:	include/linux/surface_acpi_notify.h
+@@ -13107,6 +13107,12 @@ F:	include/linux/surface_acpi_notify.h
  F:	include/linux/surface_aggregator/
  F:	include/uapi/linux/surface_aggregator/
  
@@ -3888,9 +3888,9 @@ index c680792a037e..0cbb7f3a6b2d 100644
  MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
  MODULE_DESCRIPTION("Device-registry for Surface System Aggregator Module");
 -- 
-2.37.1
+2.37.2
 
-From 9c9da774771e2f7cc961ef27ac97d5791d3a0661 Mon Sep 17 00:00:00 2001
+From 19b914283b8e6567b0deb085053a8a781c1ad0fa Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:57:40 +0200
 Subject: [PATCH] platform/surface: Update copyright year of various drivers
@@ -4207,9 +4207,9 @@ index 6373d3b5eb7f..fbf2e11fd6ce 100644
  
  #include <asm/unaligned.h>
 -- 
-2.37.1
+2.37.2
 
-From 004ed830c321ad225c6f39bde9a913f64046f283 Mon Sep 17 00:00:00 2001
+From 19a402021f13a0b2382271189e1dc017205ada1f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jun 2022 20:42:00 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Rename HID device
@@ -4280,9 +4280,9 @@ index d5655f6a4a41..b325fa0c5ee0 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From 022bd43278b0160482e1c6d1ee8a9066ca4cb8a7 Mon Sep 17 00:00:00 2001
+From 20db0502d55279d6b4cca93ebd7ff1b2920f320c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jun 2022 20:52:47 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Rename HID device
@@ -4373,9 +4373,9 @@ index b325fa0c5ee0..3aa825b5aa26 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From d3dc81aaf1881b6c07e127aa791d85b1b336f39c Mon Sep 17 00:00:00 2001
+From 4680063aaad14e3083227e1e66d16f2c8c46da33 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jun 2022 20:54:59 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add HID devices for
@@ -4409,9 +4409,9 @@ index 3aa825b5aa26..4c2f9f789354 100644
  };
  
 -- 
-2.37.1
+2.37.2
 
-From 1972da085f54a81036d8b5e69e1e66818f76be32 Mon Sep 17 00:00:00 2001
+From 72f14fa3dd5b2a5dd209a696ee3fb7562720a5d0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 8 Jul 2022 03:34:44 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -4441,5 +4441,5 @@ index 4c2f9f789354..49426b6e6b19 100644
  	{ "MSHW0123", (unsigned long)ssam_node_group_sls },
  
 -- 
-2.37.1
+2.37.2
 

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

@@ -1,4 +1,4 @@
-From 7a21e88e9498b88053f202f303ab895b23962e2e Mon Sep 17 00:00:00 2001
+From b64a10b0bee51c89d31ce74c19332da29a649593 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -108,9 +108,9 @@ index 08b561f0709d..d7c397bce0f0 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.37.1
+2.37.2
 
-From c8c6c05dcd26ebe53bc1ce9def755cb5a45b457d Mon Sep 17 00:00:00 2001
+From 3abe84a0aeaf48ba7989773d7174bf700b7079ac Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
@@ -331,5 +331,5 @@ index 000000000000..8b816ed8f35c
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.37.1
+2.37.2
 

+ 4 - 4
patches/5.18/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From 1d03fd53f46ff560e61ca3e14d69b6f624c71ccd Mon Sep 17 00:00:00 2001
+From 35879d4ed707cf91c40eecfcb30609359af6c78e Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:05:09 +1100
 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@@ -73,9 +73,9 @@ index 480476121c01..36e1bf7b7a01 100644
  
  /*
 -- 
-2.37.1
+2.37.2
 
-From 26318095647285c03f98fb47d8efbcab068c52e1 Mon Sep 17 00:00:00 2001
+From 627721b4b779ab79f86fc305b9680bc8ae3258d6 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:22:57 +1100
 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
@@ -145,5 +145,5 @@ index 242fb690dcaf..30eea54dbb47 100644
  
  
 -- 
-2.37.1
+2.37.2
 

+ 4 - 4
patches/5.18/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 7652c18f7ddd0f8747cadc8e8da1ae0b8f996055 Mon Sep 17 00:00:00 2001
+From 1129d8ed78f239a7d85929ae7c38f89ec51af8a1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -229,9 +229,9 @@ index 6bb3890b0f2c..c28349e90156 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.37.1
+2.37.2
 
-From 15641be13a70609b0432508c062242e343f9c0e6 Mon Sep 17 00:00:00 2001
+From 2efbc56c3ce4cd31a9ca25abd8ccb7de01c16616 Mon Sep 17 00:00:00 2001
 From: PJungkamp <p.jungkamp@gmail.com>
 Date: Fri, 25 Feb 2022 12:04:25 +0100
 Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet
@@ -529,5 +529,5 @@ index c28349e90156..61142639be26 100644
  	unregister_pm_notifier(&td->pm_notifier);
  	del_timer_sync(&td->release_timer);
 -- 
-2.37.1
+2.37.2
 

+ 2 - 50
patches/5.18/0009-surface-battery.patch

@@ -1,4 +1,4 @@
-From 99bde5a80e1cb4c25a6b5dd0cf3efb819993f27c Mon Sep 17 00:00:00 2001
+From 731a5eb141f0f579b74a9b0fe23b4af987c77a0b Mon Sep 17 00:00:00 2001
 From: Werner Sembach <wse@tuxedocomputers.com>
 Date: Wed, 27 Apr 2022 17:40:53 +0200
 Subject: [PATCH] ACPI: battery: Make "not-charging" the default on no charging
@@ -79,53 +79,5 @@ index dc208f5f5a1f..306513fec1e1 100644
  		/* Microsoft Surface Go 3 */
  		.callback = battery_notification_delay_quirk,
 -- 
-2.37.1
-
-From 6c65f5e22a77ce057c949544d98a1404c9af0e5a Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Wed, 25 May 2022 14:20:10 +0200
-Subject: [PATCH] HID: hid-input: add Surface Go battery quirk
-
-Similar to the Surface Go (1), the (Elantech) touchscreen/digitizer in
-the Surface Go 2 mistakenly reports the battery of the stylus. Instead
-of over the touchsreen device, battery information is provided via
-bluetooth and the touchscreen device reports an empty battery.
-
-Apply the HID_BATTERY_QUIRK_IGNORE quirk to to ignore this battery and
-prevent the erroneous low battery warnings.
-
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
-Patchset: surface-battery
----
- drivers/hid/hid-ids.h   | 1 +
- drivers/hid/hid-input.c | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index c297c63f3ec5..e233726d9a74 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -413,6 +413,7 @@
- #define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN	0x2544
- #define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN	0x2706
- #define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A
-+#define I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN	0x2A1C
- 
- #define USB_VENDOR_ID_ELECOM		0x056e
- #define USB_DEVICE_ID_ELECOM_BM084	0x0061
-diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
-index c6b27aab9041..48c1c02c69f4 100644
---- a/drivers/hid/hid-input.c
-+++ b/drivers/hid/hid-input.c
-@@ -381,6 +381,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
- 	  HID_BATTERY_QUIRK_IGNORE },
- 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
- 	  HID_BATTERY_QUIRK_IGNORE },
-+	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN),
-+	  HID_BATTERY_QUIRK_IGNORE },
- 	{}
- };
- 
--- 
-2.37.1
+2.37.2
 

+ 2 - 2
patches/5.18/0010-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 2838425d467a8e145996fe1b879fd36cf8f60e43 Mon Sep 17 00:00:00 2001
+From 21c2c2cd1985f6050f652a36f6025cc64fc2e7a7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 21 Jul 2022 02:15:50 +0200
 Subject: [PATCH] platform/surface: gpe: Add support for 13" Intel version of
@@ -37,5 +37,5 @@ index 27365cbe1ee9..c219b840d491 100644
  		.ident = "Surface Laptop Studio",
  		.matches = {
 -- 
-2.37.1
+2.37.2
 

+ 27 - 27
patches/5.18/0011-cameras.patch

@@ -1,4 +1,4 @@
-From f69daac8d338b896b944123a773d9bc15149089b Mon Sep 17 00:00:00 2001
+From 5271cb0a99d23130806f0a4bd2b5440023163a62 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Sun, 10 Oct 2021 20:56:57 +0200
 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@@ -72,9 +72,9 @@ index 762b61f67e6c..2c0f39a7f2a1 100644
  	 * Do not enumerate devices with enumeration_by_parent flag set as
  	 * they will be enumerated by their respective parents.
 -- 
-2.37.1
+2.37.2
 
-From 275780a8f7a5839eb10eb244b314c84b35af9c6b Mon Sep 17 00:00:00 2001
+From 6596a99eddeeaa1167b7c3363036701cb5b0427c 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 7f3699e19270..0ee615daadeb 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  
 -- 
-2.37.1
+2.37.2
 
-From 25c52ddb88634f7a8eff9d7186b6cae8b9c58efe Mon Sep 17 00:00:00 2001
+From c6e12368fc3a4610a28f66c3f6b6ba896df7bda4 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 10 Oct 2021 20:57:02 +0200
 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@@ -226,9 +226,9 @@ index 22f61b47f9e5..e1de1ff40bba 100644
  
  	return 0;
 -- 
-2.37.1
+2.37.2
 
-From bfb13e4ff4c75ce472209c78b648d54ce88e47b9 Mon Sep 17 00:00:00 2001
+From 03bc16d2ed07c397a051ee0f08058517e3c7e59a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Oct 2021 21:55:16 +0100
 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
@@ -247,7 +247,7 @@ Patchset: cameras
  create mode 100644 drivers/media/i2c/dw9719.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 26bc8bf48b7b..a5d382fca868 100644
+index f96b3dba903a..03452d847a52 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -6002,6 +6002,13 @@ T:	git git://linuxtv.org/media_tree.git
@@ -265,7 +265,7 @@ index 26bc8bf48b7b..a5d382fca868 100644
  M:	Dongchun Zhu <dongchun.zhu@mediatek.com>
  L:	linux-media@vger.kernel.org
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 2b20aa6c37b1..49d1c59334e3 100644
+index c926e5d43820..5c245f642ae3 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -806,6 +806,17 @@ config VIDEO_DW9714
@@ -732,9 +732,9 @@ index 000000000000..8451c75b696b
 +MODULE_DESCRIPTION("DW9719 VCM Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.37.1
+2.37.2
 
-From 4b28f81adc6a0ada0a98fb702c21be016d942d81 Mon Sep 17 00:00:00 2001
+From 8792b2fe58ecf2b5a4d7195d7846dac21a740c9c 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
@@ -748,7 +748,7 @@ Patchset: cameras
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 49d1c59334e3..d3f27554a1e3 100644
+index 5c245f642ae3..50ea62e63784 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -808,7 +808,7 @@ config VIDEO_DW9714
@@ -761,9 +761,9 @@ index 49d1c59334e3..d3f27554a1e3 100644
  	select VIDEO_V4L2_SUBDEV_API
  	select V4L2_ASYNC
 -- 
-2.37.1
+2.37.2
 
-From 77aceb4860fece1e2fb0f4f732e912cb64d44d2c Mon Sep 17 00:00:00 2001
+From 498ae9f4a0e000ab0ee3eb140466f54d22ebbbac Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:38:17 +0000
 Subject: [PATCH] media: entity: Skip non-data links in graph iteration
@@ -796,9 +796,9 @@ index 8ab0913d8d82..a8631f74dcee 100644
  	if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
  		link_top(graph) = link_top(graph)->next;
 -- 
-2.37.1
+2.37.2
 
-From b2ff8201cf8a965ef5f909a659effa04f811cfb4 Mon Sep 17 00:00:00 2001
+From ab99732bedda2cd5e8c97c22b682fb95f3e1dc4a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:53:09 +0000
 Subject: [PATCH] media: media.h: Add new media link type
@@ -880,9 +880,9 @@ index 200fa8462b90..afbae7213d35 100644
  struct media_link_desc {
  	struct media_pad_desc source;
 -- 
-2.37.1
+2.37.2
 
-From 502f8e0be7436c1ada19e263264120d211968d55 Mon Sep 17 00:00:00 2001
+From 512b2e9c2dddd2924c95d5d9548ca89db1edefd1 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:36:31 +0000
 Subject: [PATCH] media: entity: Add link_type_name() helper
@@ -935,9 +935,9 @@ index a8631f74dcee..4bd80ce1a33d 100644
  			media_id(link->gobj1));
  		break;
 -- 
-2.37.1
+2.37.2
 
-From 85545c29d475922ecaceb9c1c6993410d9d005f6 Mon Sep 17 00:00:00 2001
+From ab787dfcd33ab0d1d1bc9c8faaf7b3a4b9a9c2cc Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:54:10 +0000
 Subject: [PATCH] media: entity: Add support for ancillary links
@@ -1012,9 +1012,9 @@ index 742918962d46..1d13b8939a11 100644
 +
  #endif
 -- 
-2.37.1
+2.37.2
 
-From 7252a4f84ff3e155735ee7eabd5148da651b6f71 Mon Sep 17 00:00:00 2001
+From ddc66e6de51574fb41902754928996c210710a0e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 26 Nov 2021 22:55:50 +0000
 Subject: [PATCH] media: v4l2-async: Create links during
@@ -1085,9 +1085,9 @@ index 0404267f1ae4..436bd6900fd8 100644
  	list_del(&asd->list);
  	sd->asd = asd;
 -- 
-2.37.1
+2.37.2
 
-From bd0f52abb765c1626b212a9603663ab3da395cbe Mon Sep 17 00:00:00 2001
+From 9265a11f92a688baa1f820936e217bc8490c57c3 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
@@ -1200,9 +1200,9 @@ index 0e9b0503b62a..50682a7b2a07 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.37.1
+2.37.2
 
-From abea0bcfd5000e11518593a806641ff87c08319a Mon Sep 17 00:00:00 2001
+From 54b2514cecc9cb79754586cfb1a716251f91b5e1 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
@@ -1243,5 +1243,5 @@ index 50682a7b2a07..ff79582a583d 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.37.1
+2.37.2
 

+ 4 - 4
patches/5.18/0012-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 9d332902ac73d5c7fcda12d5c7e8e24c5b8f7178 Mon Sep 17 00:00:00 2001
+From 8a7173b053bb41d26fade409d7c169fcfeb25914 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 17:47:38 +1000
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@@ -63,9 +63,9 @@ index 0d01e7f5078c..2b06cf5f2b1f 100644
  	mp_config_acpi_legacy_irqs();
  
 -- 
-2.37.1
+2.37.2
 
-From 0e28bf57c4cbde44111cfb61df4e82c1d7049474 Mon Sep 17 00:00:00 2001
+From 4ee13359ba1a15044800b1451f3ab951cf5d462a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
@@ -105,5 +105,5 @@ index 2b06cf5f2b1f..caaec200bea2 100644
  };
  
 -- 
-2.37.1
+2.37.2