From 944cabb9a01b3069d1f016d021f0b6b8aa78f69d Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 13 Dec 2023 22:22:36 +0100 Subject: [PATCH] Update v6.1 patches Changes: - Rebase onto v6.1.68 Links: - kernel: https://github.com/linux-surface/kernel/commit/4ebedac16e49f13b9beb74fb52b118b273e6d91b --- patches/6.1/0001-surface3-oemb.patch | 6 +- patches/6.1/0002-mwifiex.patch | 16 +++--- patches/6.1/0003-ath10k.patch | 4 +- patches/6.1/0004-ipts.patch | 38 ++++++------ patches/6.1/0005-ithc.patch | 12 ++-- patches/6.1/0006-surface-sam.patch | 64 ++++++++++----------- patches/6.1/0007-surface-sam-over-hid.patch | 8 +-- patches/6.1/0008-surface-button.patch | 8 +-- patches/6.1/0009-surface-typecover.patch | 12 ++-- patches/6.1/0010-surface-shutdown.patch | 14 ++--- patches/6.1/0011-surface-gpe.patch | 4 +- patches/6.1/0012-cameras.patch | 48 ++++++++-------- patches/6.1/0013-amd-gpio.patch | 8 +-- patches/6.1/0014-rtc.patch | 4 +- 14 files changed, 123 insertions(+), 123 deletions(-) diff --git a/patches/6.1/0001-surface3-oemb.patch b/patches/6.1/0001-surface3-oemb.patch index 2fc46d06e..d78c6aa1f 100644 --- a/patches/6.1/0001-surface3-oemb.patch +++ b/patches/6.1/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 17feeb3203722f8e933b46972a1efa9c19e030ff Mon Sep 17 00:00:00 2001 +From 2acd7992241ea64d9951883df8bef8517223dded Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 18 Oct 2020 16:42:44 +0900 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI @@ -78,7 +78,7 @@ index f86fc7cd104d4..12e365b046c3e 100644 /* * Match for the GPDwin which unfortunately uses somewhat diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -index cdcbf04b8832f..958305779b125 100644 +index 5e2ec60e2954b..207868c699f29 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c @@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = { @@ -97,5 +97,5 @@ index cdcbf04b8832f..958305779b125 100644 }; -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0002-mwifiex.patch b/patches/6.1/0002-mwifiex.patch index e32571446..11b19c52e 100644 --- a/patches/6.1/0002-mwifiex.patch +++ b/patches/6.1/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 2d03691de60b027c21f0591011ed30d0d7f41459 Mon Sep 17 00:00:00 2001 +From 9e6cf17a5a5d7bdbca633149113589fb1c284b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= 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 d6ff964aec5bf..5d30ae39d65ec 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.42.1 +2.43.0 -From a72f0edf4203a0e3f01c248e96966f837814f2c5 Mon Sep 17 00:00:00 2001 +From 8abee4e333a06b05d4022c39f1684703046d531d Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 4 Oct 2020 00:11:49 +0900 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+ @@ -318,9 +318,9 @@ index 5d30ae39d65ec..c14eb56eb9118 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.42.1 +2.43.0 -From 502e45fd7b532fa2f720dd3f50684f92a6f2400e Mon Sep 17 00:00:00 2001 +From 5ceb9071a3ad03eb5b64737d4bd9b9b13578025d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= 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 96d4f48e36011..b3b27930034b5 100644 +index 954f7f3b5cc30..9f2fe98ba8d9c 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 96d4f48e36011..b3b27930034b5 100644 /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED }, -@@ -3953,6 +3955,19 @@ static int btusb_probe(struct usb_interface *intf, +@@ -3968,6 +3970,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 96d4f48e36011..b3b27930034b5 100644 (id->driver_info & BTUSB_MEDIATEK)) { hdev->setup = btusb_mtk_setup; -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0003-ath10k.patch b/patches/6.1/0003-ath10k.patch index 34499f439..d256887f3 100644 --- a/patches/6.1/0003-ath10k.patch +++ b/patches/6.1/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 1e8ab59dfe3a03811ef307c102c98d3f4f2eabdd Mon Sep 17 00:00:00 2001 +From 35f5c2488c06ec946015957cc3cf966a4dda6ccf Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 27 Feb 2021 00:45:52 +0100 Subject: [PATCH] ath10k: Add module parameters to override board files @@ -117,5 +117,5 @@ index 6cdb225b7eacc..19c036751fb16 100644 ret = firmware_request_nowarn(&fw, filename, ar->dev); ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0004-ipts.patch b/patches/6.1/0004-ipts.patch index 477428cf5..696610e90 100644 --- a/patches/6.1/0004-ipts.patch +++ b/patches/6.1/0004-ipts.patch @@ -1,4 +1,4 @@ -From 96cadf46dc88e6ae59a5128aa94008d8035567de Mon Sep 17 00:00:00 2001 +From f60c20c6c9b523c10037e83bf77f928672aa4185 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 30 Jul 2020 13:21:53 +0200 Subject: [PATCH] misc: mei: Add missing IPTS device IDs @@ -34,9 +34,9 @@ index 5bf0d50d55a00..c13864512229f 100644 {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)}, -- -2.42.1 +2.43.0 -From 541fed1d9c40eeb5ffb5ce13c655c58ba8e4c689 Mon Sep 17 00:00:00 2001 +From 83d2bb14c8b9f8f6d5bd0d4bbbc56ddf9f733c9e Mon Sep 17 00:00:00 2001 From: Liban Hannan Date: Tue, 12 Apr 2022 23:31:12 +0100 Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS @@ -58,7 +58,7 @@ Patchset: ipts 1 file changed, 24 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index 5c4f5aa8e87e4..66e8a5c18fb81 100644 +index e111b35a7aff2..694feb396f77c 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -37,6 +37,8 @@ @@ -85,7 +85,7 @@ index 5c4f5aa8e87e4..66e8a5c18fb81 100644 const struct iommu_ops intel_iommu_ops; -@@ -2630,6 +2634,9 @@ static int device_def_domain_type(struct device *dev) +@@ -2625,6 +2629,9 @@ static int device_def_domain_type(struct device *dev) if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev)) return IOMMU_DOMAIN_IDENTITY; @@ -95,7 +95,7 @@ index 5c4f5aa8e87e4..66e8a5c18fb81 100644 } return 0; -@@ -3019,6 +3026,9 @@ static int __init init_dmars(void) +@@ -3014,6 +3021,9 @@ static int __init init_dmars(void) if (!dmar_map_gfx) iommu_identity_mapping |= IDENTMAP_GFX; @@ -105,7 +105,7 @@ index 5c4f5aa8e87e4..66e8a5c18fb81 100644 check_tylersburg_isoch(); ret = si_domain_init(hw_pass_through); -@@ -4772,6 +4782,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev) +@@ -4809,6 +4819,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev) dmar_map_gfx = 0; } @@ -123,7 +123,7 @@ index 5c4f5aa8e87e4..66e8a5c18fb81 100644 /* G4x/GM45 integrated gfx dmar support is totally busted. */ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx); -@@ -4807,6 +4828,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); +@@ -4844,6 +4865,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx); @@ -134,9 +134,9 @@ index 5c4f5aa8e87e4..66e8a5c18fb81 100644 { if (risky_device(dev)) -- -2.42.1 +2.43.0 -From 3785d97f1800ed105c29a8d7948daba0e66b74a8 Mon Sep 17 00:00:00 2001 +From f7930dd6cfbb383978507174a136b45faf307ef1 Mon Sep 17 00:00:00 2001 From: Dorian Stoll 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 0000000000000..a314843599fc3 + +#endif /* IPTS_THREAD_H */ -- -2.42.1 +2.43.0 -From faeac71a91eee3fd41a08e283e152d7aa0b5dc8e Mon Sep 17 00:00:00 2001 +From b32cb4bd9e577c999d3850dd357e9f7bc26a674d Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Fri, 28 Apr 2023 15:41:12 +0200 Subject: [PATCH] Update IPTS from module repo @@ -3176,9 +3176,9 @@ index 6cbb24a8a0543..e0c400f420b93 100644 int ipts_resources_init(struct ipts_resources *res, struct device *dev, size_t ds, size_t fs); -- -2.42.1 +2.43.0 -From 4cdb6969e01709a9393fefa1b567395a2da87fe4 Mon Sep 17 00:00:00 2001 +From 10a08a6e47f16fde238186fca0519510d02da4a8 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Mon, 17 Jul 2023 18:10:43 +0200 Subject: [PATCH] Update IPTS from module repo @@ -4431,9 +4431,9 @@ index a314843599fc3..1f966b8b32c45 100644 * @thread: The thread that should stop. * -- -2.42.1 +2.43.0 -From ad01d57f25c19b1ac363d36335582944e8d814e4 Mon Sep 17 00:00:00 2001 +From e353a6978824aa9e198c9eae0de4f0617f25d1d0 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sat, 22 Jul 2023 17:08:56 +0200 Subject: [PATCH] Update IPTS from module repo @@ -4465,9 +4465,9 @@ index e835b460aa79e..7c5cbafdb2792 100644 memcpy(buffer, ipts_singletouch_descriptor, sizeof(ipts_singletouch_descriptor)); -- -2.42.1 +2.43.0 -From c4af467f7bb1939da358fec79698a2a1b61dd943 Mon Sep 17 00:00:00 2001 +From 5494d5cfcd373cd22ed5405f71ce4dc3894d6b37 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 23 Jul 2023 17:55:15 +0200 Subject: [PATCH] Update IPTS from module repo @@ -4498,5 +4498,5 @@ index 7c5cbafdb2792..198dc65d78876 100644 + return ipts_eds2_set_feature(ipts, buffer, size, report_id, feedback_type); } -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0005-ithc.patch b/patches/6.1/0005-ithc.patch index 90934058a..d787ffe01 100644 --- a/patches/6.1/0005-ithc.patch +++ b/patches/6.1/0005-ithc.patch @@ -1,4 +1,4 @@ -From 7246313c2540ff2261dcd3f7c61a1f575e26f5b8 Mon Sep 17 00:00:00 2001 +From 38ef18e8483a45100cf2570120840a6b876fcd54 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:03:38 +0100 Subject: [PATCH] iommu: intel: Disable source id verification for ITHC @@ -37,9 +37,9 @@ index 5962bb5027d06..86fa129d10d40 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.42.1 +2.43.0 -From ffa0c316b56567e108b3b6b844da1009b1252d1d Mon Sep 17 00:00:00 2001 +From 252d606c8e8a2912588a6e3f51189b20bd517e18 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:10:54 +0100 Subject: [PATCH] hid: Add support for Intel Touch Host Controller @@ -1429,9 +1429,9 @@ index 0000000000000..6a9b0d480bc15 +void ithc_log_regs(struct ithc *ithc); + -- -2.42.1 +2.43.0 -From eeb69e19302b4136b85be57cbc5207f7796d4b2f Mon Sep 17 00:00:00 2001 +From 00f4cb480150576cbd2c240a152d93e906eebc60 Mon Sep 17 00:00:00 2001 From: quo Date: Mon, 23 Oct 2023 10:15:29 +0200 Subject: [PATCH] Update ITHC from module repo @@ -3020,5 +3020,5 @@ index 6a9b0d480bc15..028e55a4ec53e 100644 void ithc_log_regs(struct ithc *ithc); -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0006-surface-sam.patch b/patches/6.1/0006-surface-sam.patch index e90fee4ad..b2a7e445e 100644 --- a/patches/6.1/0006-surface-sam.patch +++ b/patches/6.1/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From ab7596756426936703707a1e5ef73e7eb29fa751 Mon Sep 17 00:00:00 2001 +From f5cedf8d1db6b4a2107e8061aa61086647b32ab4 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:20 +0100 Subject: [PATCH] platform/surface: aggregator: Improve documentation and @@ -287,9 +287,9 @@ index 45501b6e54e8a..5c4ae1a261831 100644 * Known SSH/EC target categories. * -- -2.42.1 +2.43.0 -From 12ab173c1d791bebe3058ef4018300f34ee972d4 Mon Sep 17 00:00:00 2001 +From 8682597843bafdccebc5dbe40d6c4025dbbebca8 Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 2a2c17771d014..55cc61bba1da6 100644 ssam_show_generic_u8_field(__entry->cid), ssam_show_generic_u8_field(__entry->iid), -- -2.42.1 +2.43.0 -From 6fd7fc13b0537cb5a8f54f397bc022abe7704f32 Mon Sep 17 00:00:00 2001 +From fc00f95b2a55287e11080138b4768d99b783483a Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 43061514be382..62f27cdb6ca8f 100644 .instance_id = 0x00, }); -- -2.42.1 +2.43.0 -From 91e9d0f901ecbe4f95ab18c809f66f41b9195ecb Mon Sep 17 00:00:00 2001 +From 6f2974c15d410ad04a8d088a26963978b291d9af Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:23 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum @@ -579,9 +579,9 @@ index af8b547cffdc6..c8ecbdbb516c5 100644 .instance_id = 0x00, }); -- -2.42.1 +2.43.0 -From 6910124499018b6b169c83c3c97f0b762dbb6cd5 Mon Sep 17 00:00:00 2001 +From aa6b853eb3725174a918c12d24b4ab1282cf24cf Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 ed36944467f9f..0de76a784a35f 100644 .instance_id = 0x00, }); -- -2.42.1 +2.43.0 -From fed9967ed648f2a64d3401dc49d2cebee84df4aa Mon Sep 17 00:00:00 2001 +From 4677f73f0eb946490b0aaff44615d256efde3955 Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 0635341bc5174..42933bf3e925f 100644 shid->uid.function = 0; -- -2.42.1 +2.43.0 -From d4b880918bcb0be0b86899230a47ef8ab1847297 Mon Sep 17 00:00:00 2001 +From 0312f5f738c011e405d648161477af225258dec5 Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 46c45d1b63682..4da20b7a0ee5e 100644 /* * enum ssam_device_flags - Flags for SSAM client devices. -- -2.42.1 +2.43.0 -From 744459092b7cede385ae79056730776728162de8 Mon Sep 17 00:00:00 2001 +From ed292028af8f1fdc9d0cff30aa98444b79e2c277 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:27 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of @@ -1002,9 +1002,9 @@ index 023f126121d7d..296f72d52e6a6 100644 }; -- -2.42.1 +2.43.0 -From 3c2690fca51094b4e1c70020e8da87977933e620 Mon Sep 17 00:00:00 2001 +From beb00051bb98b1d9d921d1ee3a305210587e9107 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 20 Dec 2022 18:56:08 +0100 Subject: [PATCH] platform/surface: aggregator: Rename top-level request @@ -1549,9 +1549,9 @@ index 4da20b7a0ee5e..1545e5567b152 100644 */ #define SSAM_DEFINE_SYNC_REQUEST_CL_WR(name, atype, rtype, spec...) \ -- -2.42.1 +2.43.0 -From a91280e2190d113bafa13f5dcfe1af07eea1091d Mon Sep 17 00:00:00 2001 +From 32eec324b754d6e810b1b2381fd0b034166873ba Mon Sep 17 00:00:00 2001 From: Andy Shevchenko 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 f004a24952013..7b6d887dccdbf 100644 static irqreturn_t shps_handle_irq(int irq, void *data) -- -2.42.1 +2.43.0 -From f687226d6018903d1b83aa33ade1d805306f2ff5 Mon Sep 17 00:00:00 2001 +From 5d97af80f3653c66417c797d4a485fc1ca2b9fb0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 4 Mar 2023 20:09:36 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle @@ -1913,9 +1913,9 @@ index a18e9fc7896b3..f9a58db6afde4 100644 } -- -2.42.1 +2.43.0 -From f3d752398a6e40145a745187e721da29c185eee6 Mon Sep 17 00:00:00 2001 +From 76d69fb396cacbd71aeccc9c53247725135b8bd9 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 23:33:43 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for @@ -2030,9 +2030,9 @@ index f9a58db6afde4..4a029f5db20a9 100644 return ssam_pos_state_is_tablet_mode_sls(sw, state->state); -- -2.42.1 +2.43.0 -From a5057b7791801289c80c8d3cdf779fa6774feabd Mon Sep 17 00:00:00 2001 +From 909b56be0047847f2870bf57a498774fba5fc315 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 18 May 2023 22:57:17 +0200 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for book @@ -2084,9 +2084,9 @@ index 4a029f5db20a9..c0a1a5869246e 100644 case SSAM_POS_COVER_CLOSED: -- -2.42.1 +2.43.0 -From 6f8ce36fced2d687102e2971d02e71ef63a73b09 Mon Sep 17 00:00:00 2001 +From ef96617c98f9f560b45e213b535457971c27cda0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 23:41:18 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -2115,9 +2115,9 @@ index 296f72d52e6a6..0fe5be5396525 100644 &ssam_node_hid_kip_penstash, &ssam_node_hid_kip_touchpad, -- -2.42.1 +2.43.0 -From b1822e3ce246626866b4b91b73a60f1bc8ccb111 Mon Sep 17 00:00:00 2001 +From dbc0096a01fcda5b9b9291a98987d03a7304a602 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 22 Oct 2023 14:57:11 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -2148,9 +2148,9 @@ index 0fe5be5396525..0d8c8395c5886 100644 { "MSHW0123", (unsigned long)ssam_node_group_sls }, -- -2.42.1 +2.43.0 -From 9fdaae3caa35fc1a1c7ccb7af454abe574441afd Mon Sep 17 00:00:00 2001 +From 537afd00ca1486fc05a6d86946134d965c182c60 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 20 Nov 2023 19:47:00 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -2218,5 +2218,5 @@ index 0d8c8395c5886..530db4db71aba 100644 { }, }; -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0007-surface-sam-over-hid.patch b/patches/6.1/0007-surface-sam-over-hid.patch index 4ff10831a..9e0e86ac8 100644 --- a/patches/6.1/0007-surface-sam-over-hid.patch +++ b/patches/6.1/0007-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From 7ec4e4279323062ca9381f8c56ef4983e3854b91 Mon Sep 17 00:00:00 2001 +From f74e0c0e3932a790a07c8fcf87fed05f8384abb3 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH] i2c: acpi: Implement RawBytes read access @@ -108,9 +108,9 @@ index 4dd777cc0c89f..b2338618163ad 100644 dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n", accessor_type, client->addr); -- -2.42.1 +2.43.0 -From f6af911c8d9d3d67f1a0557d0a2bb9564f6ecc6c Mon Sep 17 00:00:00 2001 +From 821a0ecd250072b04ddba50cb3f4eeb4c560f961 Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 0000000000000..8b816ed8f35c6 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1"); +MODULE_LICENSE("GPL"); -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0008-surface-button.patch b/patches/6.1/0008-surface-button.patch index 7791ca097..152278615 100644 --- a/patches/6.1/0008-surface-button.patch +++ b/patches/6.1/0008-surface-button.patch @@ -1,4 +1,4 @@ -From eb947492b99c55f01cc2a3e4a640bd76d98d5c17 Mon Sep 17 00:00:00 2001 +From 9409214525fb02622beb3a77257fb47a35dd4d3e Mon Sep 17 00:00:00 2001 From: Sachi King 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 e79f5497948b8..2bddbe6e9ea4d 100644 /* -- -2.42.1 +2.43.0 -From ea4e70663a887d7491adefe712ebe6fbe1a7c489 Mon Sep 17 00:00:00 2001 +From ff4324f6a41ced95a3b22dd717c7e2fced2f1a53 Mon Sep 17 00:00:00 2001 From: Sachi King 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 242fb690dcaf7..30eea54dbb477 100644 -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0009-surface-typecover.patch b/patches/6.1/0009-surface-typecover.patch index cc54690b7..a373098d9 100644 --- a/patches/6.1/0009-surface-typecover.patch +++ b/patches/6.1/0009-surface-typecover.patch @@ -1,4 +1,4 @@ -From 4dcd74ed69260bbcdb2bdb63b1ec3151601096cc Mon Sep 17 00:00:00 2001 +From bf131bac4a1904c595f8f794758cb83c2edbbb19 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 18 Feb 2023 01:02:49 +0100 Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3 @@ -37,9 +37,9 @@ index 15e9bd180a1d2..0d70461d01e16 100644 { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, -- -2.42.1 +2.43.0 -From 7c82ff63029474fd933e6e2e7cd3ef2579348380 Mon Sep 17 00:00:00 2001 +From 0fe3cf5eb85d93d919e269afa958dac2a0726e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= 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 8db4ae05febc8..99a5efef45258 100644 { .driver_data = MT_CLS_GOOGLE, HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE, -- -2.42.1 +2.43.0 -From 58c4dae1eedf71fc401fb68c4572916def72e889 Mon Sep 17 00:00:00 2001 +From d7458134edad82db426df42787f8f5a03f8b79f1 Mon Sep 17 00:00:00 2001 From: PJungkamp 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 99a5efef45258..6ae43ea90bcd5 100644 unregister_pm_notifier(&td->pm_notifier); del_timer_sync(&td->release_timer); -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0010-surface-shutdown.patch b/patches/6.1/0010-surface-shutdown.patch index f39c4311a..158068d96 100644 --- a/patches/6.1/0010-surface-shutdown.patch +++ b/patches/6.1/0010-surface-shutdown.patch @@ -1,4 +1,4 @@ -From 5a373d8059061525923b3ddcfdca557efc98f380 Mon Sep 17 00:00:00 2001 +From 21051315225cf1bfa25fd36a3a4c5d54cdb121e2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 22:12:24 +0100 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod @@ -37,13 +37,13 @@ index f47a3b10bf504..9ea4352aac56c 100644 if (drv && drv->shutdown) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 30e7c627f21a7..4a0fbcc7478a9 100644 +index c132839d99dc8..d6df592f4ae1b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -6037,3 +6037,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 +@@ -6070,3 +6070,39 @@ static void pci_fixup_d3cold_delay_1sec(struct pci_dev *pdev) + pdev->d3cold_delay = 1000; + } + DECLARE_PCI_FIXUP_FINAL(0x5555, 0x0004, pci_fixup_d3cold_delay_1sec); + +static const struct dmi_system_id no_shutdown_dmi_table[] = { + /* @@ -93,5 +93,5 @@ index eccaf1abea79d..f3684d9a388a3 100644 atomic_t enable_cnt; /* pci_enable_device has been called */ -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0011-surface-gpe.patch b/patches/6.1/0011-surface-gpe.patch index 75f970b73..eff4b1e6c 100644 --- a/patches/6.1/0011-surface-gpe.patch +++ b/patches/6.1/0011-surface-gpe.patch @@ -1,4 +1,4 @@ -From 2a81444e193f8898e84204ec7fba4e9255e893e1 Mon Sep 17 00:00:00 2001 +From f751bf0a5ae35f424149a530c3c36130b6e5d4e9 Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 c219b840d491a..69c4352e8406b 100644 .ident = "Surface Book 1", .matches = { -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0012-cameras.patch b/patches/6.1/0012-cameras.patch index e5dd92e14..1a1a03551 100644 --- a/patches/6.1/0012-cameras.patch +++ b/patches/6.1/0012-cameras.patch @@ -1,4 +1,4 @@ -From c8b08ed3804219e4d29ea579c7782e97b9d4b9fa Mon Sep 17 00:00:00 2001 +From ac24d9243baf72945cf2d4f9ce02c040dbc96816 Mon Sep 17 00:00:00 2001 From: Hans de Goede 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 a0e347f6f97eb..167dbf4cf6237 100644 +index 94154a849a3ea..f7e57d1a72a0b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -2107,6 +2107,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used, +@@ -2112,6 +2112,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 a0e347f6f97eb..167dbf4cf6237 100644 * Do not enumerate devices with enumeration_by_parent flag set as * they will be enumerated by their respective parents. -- -2.42.1 +2.43.0 -From 22f961cdaae4a95af6a05b504eef7fe3a7079e1a Mon Sep 17 00:00:00 2001 +From e76710fa036bd40c798c1805a59c9e6339628202 Mon Sep 17 00:00:00 2001 From: zouxiaoh Date: Fri, 25 Jun 2021 08:52:59 +0800 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs @@ -100,7 +100,7 @@ Patchset: cameras 1 file changed, 30 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index 66e8a5c18fb81..73beca5d7ca95 100644 +index 694feb396f77c..9433f235558a6 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -37,6 +37,12 @@ @@ -131,7 +131,7 @@ index 66e8a5c18fb81..73beca5d7ca95 100644 #define IDENTMAP_IPTS 16 const struct iommu_ops intel_iommu_ops; -@@ -2635,6 +2643,9 @@ static int device_def_domain_type(struct device *dev) +@@ -2630,6 +2638,9 @@ static int device_def_domain_type(struct device *dev) if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev)) return IOMMU_DOMAIN_IDENTITY; @@ -141,7 +141,7 @@ index 66e8a5c18fb81..73beca5d7ca95 100644 if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev)) return IOMMU_DOMAIN_IDENTITY; } -@@ -3026,6 +3037,9 @@ static int __init init_dmars(void) +@@ -3021,6 +3032,9 @@ static int __init init_dmars(void) if (!dmar_map_gfx) iommu_identity_mapping |= IDENTMAP_GFX; @@ -151,7 +151,7 @@ index 66e8a5c18fb81..73beca5d7ca95 100644 if (!dmar_map_ipts) iommu_identity_mapping |= IDENTMAP_IPTS; -@@ -4782,6 +4796,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev) +@@ -4819,6 +4833,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev) dmar_map_gfx = 0; } @@ -170,7 +170,7 @@ index 66e8a5c18fb81..73beca5d7ca95 100644 static void quirk_iommu_ipts(struct pci_dev *dev) { if (!IS_IPTS(dev)) -@@ -4793,6 +4819,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev) +@@ -4830,6 +4856,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev) pci_info(dev, "Passthrough IOMMU for IPTS\n"); dmar_map_ipts = 0; } @@ -178,7 +178,7 @@ index 66e8a5c18fb81..73beca5d7ca95 100644 /* G4x/GM45 integrated gfx dmar support is totally busted. */ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx); -@@ -4828,6 +4855,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); +@@ -4865,6 +4892,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx); @@ -189,9 +189,9 @@ index 66e8a5c18fb81..73beca5d7ca95 100644 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts); -- -2.42.1 +2.43.0 -From 201853ae81f13a9f576aaa01aa74a610d2f8762f Mon Sep 17 00:00:00 2001 +From 81674d60e4de1692da17d08ac65591e554626540 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 10 Oct 2021 20:57:02 +0200 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain @@ -226,9 +226,9 @@ index 5b8d1a9620a5d..6a0ff035cf209 100644 return 0; -- -2.42.1 +2.43.0 -From e09c75f932311c6ccd6ff21f7133e849963db210 Mon Sep 17 00:00:00 2001 +From 19e6c800d17390aa9ddcd41fc5e0b73fccb5632d Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Oct 2021 21:55:16 +0100 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM @@ -730,9 +730,9 @@ index 0000000000000..180b04d2a6b3a +MODULE_DESCRIPTION("DW9719 VCM Driver"); +MODULE_LICENSE("GPL"); -- -2.42.1 +2.43.0 -From 722c65eefde78b7163aa0a196f0a795d57306d06 Mon Sep 17 00:00:00 2001 +From 37d495b86676c39c4c3aa3d94b85d9d17312f924 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 4 May 2022 23:21:45 +0100 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to @@ -845,9 +845,9 @@ index 1bbe58b24d99d..159f0d6cab8fc 100644 static int cio2_parse_firmware(struct cio2_device *cio2) -- -2.42.1 +2.43.0 -From c66d88b140402029fc312ae304a2ab404dc19038 Mon Sep 17 00:00:00 2001 +From 930bd0f9b16c8687ec7dfc108898cfe85046792d Mon Sep 17 00:00:00 2001 From: Daniel Scally 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 159f0d6cab8fc..0b2abfa0c724a 100644 static int cio2_parse_firmware(struct cio2_device *cio2) -- -2.42.1 +2.43.0 -From 945e96d38c159edd703871d3d5e1b20af83bf6c6 Mon Sep 17 00:00:00 2001 +From 39a606fe4ebb5b363c8cf2a5b5338bb82b4fc84e Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 15 Jul 2022 23:48:00 +0200 Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies @@ -917,9 +917,9 @@ index fbaa2ce7fa3e6..7a46ad85dbd4c 100644 select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC -- -2.42.1 +2.43.0 -From a2a55bde23d67598939ddfa613835a7420338df6 Mon Sep 17 00:00:00 2001 +From 5863d1a3f750d06395917e8c42b8ecb8954fc7ef Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 2 Mar 2023 12:59:39 +0000 Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E @@ -973,5 +973,5 @@ index c42c3faa2c32d..6f4b8e24eb56c 100644 if (!func) return 0; -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0013-amd-gpio.patch b/patches/6.1/0013-amd-gpio.patch index 0d031dfa8..1c2954135 100644 --- a/patches/6.1/0013-amd-gpio.patch +++ b/patches/6.1/0013-amd-gpio.patch @@ -1,4 +1,4 @@ -From ba428932d5a41954204b59b90abe93faed558087 Mon Sep 17 00:00:00 2001 +From 215d61e36b0688ae02305f4d200c4485796bdeee Mon Sep 17 00:00:00 2001 From: Sachi King 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 2252340b2133e..cc8115d7323dd 100644 mp_config_acpi_legacy_irqs(); -- -2.42.1 +2.43.0 -From 6e55a8d37565fdc7320661c49ea4337be6a7cb7d Mon Sep 17 00:00:00 2001 +From a591381b80ead6f74f5eb716265b4effebdbcb96 Mon Sep 17 00:00:00 2001 From: Maximilian Luz 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 cc8115d7323dd..f675eab6611be 100644 }; -- -2.42.1 +2.43.0 diff --git a/patches/6.1/0014-rtc.patch b/patches/6.1/0014-rtc.patch index f97c0af6e..b2e801897 100644 --- a/patches/6.1/0014-rtc.patch +++ b/patches/6.1/0014-rtc.patch @@ -1,4 +1,4 @@ -From fd967a1be7993e4a9be7d5f68f74e4d22932fd9f Mon Sep 17 00:00:00 2001 +From 04445c2e52a3d62e9197b6c0b4244758b034696c Mon Sep 17 00:00:00 2001 From: "Bart Groeneveld | GPX Solutions B.V" 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 e9b8e8305e23e..944276934e7ec 100644 ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group); if (ret) -- -2.42.1 +2.43.0