From 7a3043f810335472c2d1953b0c4e3ee6208ffe64 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 13 Jun 2021 23:00:11 +0200 Subject: [PATCH] Update v5.10 patches Changes: - SAM: - Fix bug in Surface HID get-report function - Fix other small issues Links: - kernel: https://github.com/linux-surface/kernel/commit/459bd42a63ed847d0bd302cee4f6e609f7d48611 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/0686c05d4b65602d149e7c6ed255b529d50bafd0 --- patches/5.10/0001-surface3-oemb.patch | 4 +- patches/5.10/0002-wifi.patch | 100 +++--- patches/5.10/0003-ipts.patch | 12 +- patches/5.10/0004-surface-gpe.patch | 4 +- patches/5.10/0005-surface-sam-over-hid.patch | 8 +- patches/5.10/0006-surface-sam.patch | 312 +++++++++++------- patches/5.10/0007-surface-hotplug.patch | 8 +- patches/5.10/0008-surface-typecover.patch | 16 +- .../5.10/0009-surface-go-touchscreen.patch | 4 +- patches/5.10/0010-surface-sensors.patch | 4 +- patches/5.10/0011-cameras.patch | 232 ++++++------- .../5.10/0012-ath10k-firmware-override.patch | 4 +- 12 files changed, 388 insertions(+), 320 deletions(-) diff --git a/patches/5.10/0001-surface3-oemb.patch b/patches/5.10/0001-surface3-oemb.patch index 31a98e0ea..ab4f4b4a0 100644 --- a/patches/5.10/0001-surface3-oemb.patch +++ b/patches/5.10/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 08cb56fa8fbb1064fc7efd978a20656ac45d519a Mon Sep 17 00:00:00 2001 +From ff89dbd758c6008f0e29c79b4577d65b218ff882 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 @@ -97,5 +97,5 @@ index 2752dc955733..ef36a316e2ed 100644 }; -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0002-wifi.patch b/patches/5.10/0002-wifi.patch index 46bfbff69..43688335b 100644 --- a/patches/5.10/0002-wifi.patch +++ b/patches/5.10/0002-wifi.patch @@ -1,4 +1,4 @@ -From a594c31b570422c096a578e4bfbfc56c47888ca9 Mon Sep 17 00:00:00 2001 +From d7ed8c25e2698f9330c0e2fcc03707ecc2b68445 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Mon, 28 Sep 2020 17:46:49 +0900 Subject: [PATCH] mwifiex: pcie: add DMI-based quirk impl for Surface devices @@ -204,9 +204,9 @@ index 000000000000..5326ae7e5671 + +void mwifiex_initialize_quirks(struct pcie_service_card *card); -- -2.31.1 +2.32.0 -From e19fa367a39bcb4ded1e7693836c23ee1cb97e12 Mon Sep 17 00:00:00 2001 +From f629617f09276f54fbac47b6277cfdbedad24f14 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Tue, 29 Sep 2020 17:25:22 +0900 Subject: [PATCH] mwifiex: pcie: add reset_d3cold quirk for Surface gen4+ @@ -405,9 +405,9 @@ index 5326ae7e5671..8b9dcb5070d8 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); +int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.31.1 +2.32.0 -From e8503bbda9db2fff6c2df6bc5586e59deb148616 Mon Sep 17 00:00:00 2001 +From 3961d56372f9b4b95f0156af9b7865b5ea2994cd Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Tue, 29 Sep 2020 17:32:22 +0900 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3 @@ -584,9 +584,9 @@ index 8b9dcb5070d8..3ef7440418e3 100644 int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); +int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev); -- -2.31.1 +2.32.0 -From 0ed189695d49db80ff8a0258f1d79714ea4a27bc Mon Sep 17 00:00:00 2001 +From b18540b37c9962f42990bebb80804b6ccf6dad60 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Wed, 30 Sep 2020 18:08:24 +0900 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI @@ -646,9 +646,9 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644 .ident = "Surface Pro 3", .matches = { -- -2.31.1 +2.32.0 -From 95c12491ec02c55b8caee85a94986e91d152ec61 Mon Sep 17 00:00:00 2001 +From 2dab493b51b18c49663d9699b0a84097dafc2370 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+ @@ -801,9 +801,9 @@ index 3ef7440418e3..a95ebac06e13 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.31.1 +2.32.0 -From f53aa8df83b54040a73489c7b7ea593ef4b613f8 Mon Sep 17 00:00:00 2001 +From 34b65655ebafa2d377d896f927b33deec8aa222d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 10 Nov 2020 12:49:56 +0100 Subject: [PATCH] mwifiex: Use non-posted PCI register writes @@ -858,9 +858,9 @@ index fcedc663ccc7..5eea6cb73fb7 100644 } -- -2.31.1 +2.32.0 -From c5d2f830cfa1e779011227e775847eb62b96c66e Mon Sep 17 00:00:00 2001 +From 657d724bcbce813ae6a1e19da497c9ecdc369433 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 @@ -1025,9 +1025,9 @@ index a95ebac06e13..4ec2ae72f632 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.31.1 +2.32.0 -From 50394e114554a1c7b4ff3a1504bae2fea394a80f Mon Sep 17 00:00:00 2001 +From 967e049ec61c0e682a1478521fec2cea336ad2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sun, 28 Mar 2021 21:10:06 +0200 Subject: [PATCH] mwifiex: Try waking the firmware until we get an interrupt @@ -1114,9 +1114,9 @@ index 7dc54c446559..505a90743f2f 100644 if (reg->sleep_cookie) { mwifiex_pcie_dev_wakeup_delay(adapter); -- -2.31.1 +2.32.0 -From 894daf5af768aef41c93b4c90c041c8462ce3e17 Mon Sep 17 00:00:00 2001 +From e1fb3723c9aa98b3787340902f316efd051142ad 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 @@ -1192,9 +1192,9 @@ index 175cb1c0d569..5592f855258c 100644 (id->driver_info & BTUSB_MEDIATEK)) { hdev->setup = btusb_mtk_setup; -- -2.31.1 +2.32.0 -From ebefad353a61c73797e38418e0f578a1eb00195d Mon Sep 17 00:00:00 2001 +From 5b4a54ba377addca9d711df5125b6ebd8347c741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 12:31:26 +0100 Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type @@ -1293,9 +1293,9 @@ index a6b9dc6700b1..d50fd8570475 100644 mwifiex_dbg(priv->adapter, ERROR, "%s: changing to %d not supported\n", -- -2.31.1 +2.32.0 -From 34f1326e91b3871c7771e9563eace0de4e6346aa Mon Sep 17 00:00:00 2001 +From b0b8d6c015bd32610b9ff4f6fabed392768432f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 12:44:39 +0100 Subject: [PATCH] mwifiex: Use function to check whether interface type change @@ -1526,9 +1526,9 @@ index d50fd8570475..3a79a55bbfd2 100644 static void -- -2.31.1 +2.32.0 -From 3b3d6eb300246cb6ee84f21d23c51db47e0ae825 Mon Sep 17 00:00:00 2001 +From 35431dd37b3690f9820273b9ceff8602030bf74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 13:33:04 +0100 Subject: [PATCH] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION @@ -1594,9 +1594,9 @@ index 3a79a55bbfd2..66e978088061 100644 params); default: -- -2.31.1 +2.32.0 -From 7e6432d9d62ccf7249c6da0da674851a2f4dd787 Mon Sep 17 00:00:00 2001 +From a16ac3a4f00cf1bea9bd00198a02e460a6fa1a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 14:42:54 +0100 Subject: [PATCH] mwifiex: Use helper function for counting interface types @@ -1770,9 +1770,9 @@ index 66e978088061..db30f595e9f9 100644 priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED; -- -2.31.1 +2.32.0 -From 61151db698ba12217bbdc16e26fc5a217c4267b5 Mon Sep 17 00:00:00 2001 +From ac2080b28b8c95fbd2f8ee8c8512b75f5b20d070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 26 Mar 2021 15:56:58 +0100 Subject: [PATCH] mwifiex: Update virtual interface counters right after @@ -1873,9 +1873,9 @@ index db30f595e9f9..60de1cec77c7 100644 } /* -- -2.31.1 +2.32.0 -From cf0b3ff065925210757774760e855b300f7633a0 Mon Sep 17 00:00:00 2001 +From b09f5b3db7395e4a9729640d27f99b9347924012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 13:42:40 +0100 Subject: [PATCH] mwifiex: Allow switching interface type from P2P_CLIENT to @@ -1962,9 +1962,9 @@ index 60de1cec77c7..a37b504bd084 100644 return mwifiex_change_vif_to_ap(dev, curr_iftype, type, params); -- -2.31.1 +2.32.0 -From e0b615fe1d65473fa4f8fd227bfc9bf5ed55741b Mon Sep 17 00:00:00 2001 +From e661cb8bbbb186c6c720aa44ac383f58f26fe922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 26 Mar 2021 15:31:08 +0100 Subject: [PATCH] mwifiex: Handle interface type changes from AP to STATION @@ -1989,9 +1989,9 @@ index a37b504bd084..e65f285e3efe 100644 type, params); break; -- -2.31.1 +2.32.0 -From adca3f09fb5ed7720b3bfe676e40ebd81a1d8f5c Mon Sep 17 00:00:00 2001 +From 8ea674aaf3a202dba5dd3c6e359082471d4a8d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 26 Mar 2021 15:32:16 +0100 Subject: [PATCH] mwifiex: Properly initialize private structure on interface @@ -2044,9 +2044,9 @@ index e65f285e3efe..a290312313f3 100644 default: mwifiex_dbg(adapter, ERROR, -- -2.31.1 +2.32.0 -From faaa6d19859436629e44b23db9b34482368c9771 Mon Sep 17 00:00:00 2001 +From 6a51a8d8fd9d4296ff1d623b737f8d2518b29e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sat, 27 Mar 2021 12:19:14 +0100 Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual @@ -2076,9 +2076,9 @@ index a290312313f3..1e1cf523e228 100644 priv->bss_started = 0; -- -2.31.1 +2.32.0 -From 27bec794c07f3f1cc05c376c8a9dacb13376d41b Mon Sep 17 00:00:00 2001 +From 82a66835cd72694d45629fca27534a29e8c1e5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 14:30:28 +0200 Subject: [PATCH] mwifiex: Deactive host sleep using HSCFG after it was @@ -2232,9 +2232,9 @@ index d3a968ef21ef..76db9a7b8199 100644 hs_cfg->action = cpu_to_le16(HS_CONFIGURE); hs_cfg->params.hs_config.conditions = hscfg_param->conditions; -- -2.31.1 +2.32.0 -From 32e896507a2ad9e47fcdbecdfbffedc79ae02499 Mon Sep 17 00:00:00 2001 +From bd68a750ef8eac066097b0243c8469736d6d64b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 14:23:05 +0200 Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain @@ -2335,9 +2335,9 @@ index 119ccacd1fcc..fb245adba19f 100644 version_ext->version_str_sel = ver_ext->version_str_sel; memcpy(version_ext->version_str, ver_ext->version_str, -- -2.31.1 +2.32.0 -From 64708f6e646e81a3a5594c9939cbc892aefd3c61 Mon Sep 17 00:00:00 2001 +From 492945f6ca32ba1921430b8377525a0f9c3adfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 15:17:07 +0100 Subject: [PATCH] mwifiex: Don't log error on suspend if wake-on-wlan is @@ -2367,9 +2367,9 @@ index 1e1cf523e228..1cdd66c37cfc 100644 ret = 0; goto done; -- -2.31.1 +2.32.0 -From 988253c60aab2d13242efdf0b44781bce62c8e78 Mon Sep 17 00:00:00 2001 +From 3e637f1b2fb594722985a35df25139f3e29f5854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sun, 28 Mar 2021 21:42:54 +0200 Subject: [PATCH] mwifiex: Log an error on command failure during key-material @@ -2407,9 +2407,9 @@ index 1cdd66c37cfc..6ad935c1bb47 100644 /* -- -2.31.1 +2.32.0 -From 7c81b0fb0bf545fb34aff3475e2a3fef31b28b64 Mon Sep 17 00:00:00 2001 +From 942f98428170b7eab263e1a494a7fcb0861bc597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:44:03 +0200 Subject: [PATCH] mwifiex: Fix an incorrect comment @@ -2435,9 +2435,9 @@ index 6696bce56178..b0695432b26a 100644 if (!INITIATOR_BIT(del_ba_param_set)) return 0; -- -2.31.1 +2.32.0 -From 74baa679ee85dd85c170011d30bc9cc25e99eee6 Mon Sep 17 00:00:00 2001 +From bff2a40934a7760efaca40f4c8f756b77dc0ab7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:45:59 +0200 Subject: [PATCH] mwifiex: Send DELBA requests according to spec @@ -2478,9 +2478,9 @@ index b0695432b26a..9ff2058bcd7e 100644 /* We don't wait for the response of this command */ -- -2.31.1 +2.32.0 -From 8332e36907fe5e9b9270f389a0f5ad409be9de0d Mon Sep 17 00:00:00 2001 +From 2bca62596d2541f053f811d0d8ca2384ee1557e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:57:41 +0200 Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware @@ -2516,5 +2516,5 @@ index bc79ca4cb803..5e9e67d97857 100644 case EVENT_RXBA_SYNC: dev_dbg(adapter->dev, "EVENT: RXBA_SYNC\n"); -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0003-ipts.patch b/patches/5.10/0003-ipts.patch index 1785662b4..05602d4d8 100644 --- a/patches/5.10/0003-ipts.patch +++ b/patches/5.10/0003-ipts.patch @@ -1,4 +1,4 @@ -From 9f2ce23ad1f92d5cf080866a9d18ac6075572d8b Mon Sep 17 00:00:00 2001 +From 8eadc7537e05f6a97c4558b37108fccd4e10845b 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 c3393b383e59..0098f98426c1 100644 {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)}, -- -2.31.1 +2.32.0 -From c86ba1ff2ce78e289349694ec794bfaa4733df14 Mon Sep 17 00:00:00 2001 +From b089326eb006642a7191a946da9597fa233fe422 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 25 Feb 2021 09:37:47 +0100 Subject: [PATCH] misc: mei: Remove client devices before shutting down bus @@ -63,9 +63,9 @@ index bcee77768b91..21ed765003e1 100644 mei_cancel_work(dev); -- -2.31.1 +2.32.0 -From cb4a827e9e5398226aa2990983a34d0208cce2cd Mon Sep 17 00:00:00 2001 +From 93db02ad5bb633a4828b4a538d7618e1b39a13de Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 6 Aug 2020 11:20:41 +0200 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus @@ -1530,5 +1530,5 @@ index 000000000000..53fb86a88f97 + +#endif /* _IPTS_UAPI_H_ */ -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0004-surface-gpe.patch b/patches/5.10/0004-surface-gpe.patch index f68f06dd4..429279720 100644 --- a/patches/5.10/0004-surface-gpe.patch +++ b/patches/5.10/0004-surface-gpe.patch @@ -1,4 +1,4 @@ -From ef2ad1982ad0a1b99c6b4ab89de6cb090ca9f3bf Mon Sep 17 00:00:00 2001 +From 7efa8b91539722ae6f3ce8fe7cac1dd32db91436 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 16 Aug 2020 23:39:56 +0200 Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface @@ -397,5 +397,5 @@ index 000000000000..86f6991b1215 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurface*:*"); -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0005-surface-sam-over-hid.patch b/patches/5.10/0005-surface-sam-over-hid.patch index a06851a04..c37d87e0a 100644 --- a/patches/5.10/0005-surface-sam-over-hid.patch +++ b/patches/5.10/0005-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From 86c27bca6d283e7a951745dc7aa14fc174fca66c Mon Sep 17 00:00:00 2001 +From 6340dd6c19a31222a9af3b3abcd6f18a33a05cf8 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 37c510d9347a..aed579942436 100644 dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n", accessor_type, client->addr); -- -2.31.1 +2.32.0 -From 35e4ff2e243508ec9eee56388f316a85a4688c08 Mon Sep 17 00:00:00 2001 +From adfe5b346a6d1d62f9d173382c88c2c2dc759df9 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 6 Sep 2020 04:01:19 +0200 Subject: [PATCH] platform/x86: Add driver for Surface Book 1 dGPU switch @@ -331,5 +331,5 @@ index 000000000000..8c66ed5110fd +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1"); +MODULE_LICENSE("GPL"); -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0006-surface-sam.patch b/patches/5.10/0006-surface-sam.patch index f75f2bd70..1172520e3 100644 --- a/patches/5.10/0006-surface-sam.patch +++ b/patches/5.10/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From 2599d912bd105f53b28d905e144fe36e07a4b984 Mon Sep 17 00:00:00 2001 +From afeb9e3b46cf8f5c0b340f38a6a0e37d296071e0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 17 Aug 2020 01:23:20 +0200 Subject: [PATCH] Add file2alias support for Surface Aggregator Module devices @@ -97,9 +97,9 @@ index 2417dd1dee33..a6c583362b92 100644 /* Create MODULE_ALIAS() statements. -- -2.31.1 +2.32.0 -From 497b0492c30f18635429da68acb4b3ceecaf5ad0 Mon Sep 17 00:00:00 2001 +From 0f23420ce16666785750982b3d4f2dceb1abbac2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 17 Aug 2020 01:44:30 +0200 Subject: [PATCH] platform/x86: Add support for Surface System Aggregator @@ -128,7 +128,7 @@ Patchset: surface-sam .../surface_aggregator/internal-api.rst | 67 + .../surface_aggregator/internal.rst | 577 ++++ .../surface_aggregator/overview.rst | 77 + - .../driver-api/surface_aggregator/ssh.rst | 344 +++ + .../driver-api/surface_aggregator/ssh.rst | 344 ++ arch/x86/kernel/acpi/boot.c | 24 + drivers/hid/Kconfig | 4 +- drivers/hid/Makefile | 2 + @@ -146,18 +146,18 @@ Patchset: surface-sam .../platform/x86/surface_aggregator/Makefile | 17 + drivers/platform/x86/surface_aggregator/bus.c | 415 +++ drivers/platform/x86/surface_aggregator/bus.h | 27 + - .../x86/surface_aggregator/controller.c | 2727 +++++++++++++++++ + .../x86/surface_aggregator/controller.c | 2789 +++++++++++++++++ .../x86/surface_aggregator/controller.h | 285 ++ .../platform/x86/surface_aggregator/core.c | 839 +++++ .../x86/surface_aggregator/ssh_msgb.h | 205 ++ - .../x86/surface_aggregator/ssh_packet_layer.c | 2074 +++++++++++++ + .../x86/surface_aggregator/ssh_packet_layer.c | 2074 ++++++++++++ .../x86/surface_aggregator/ssh_packet_layer.h | 190 ++ .../x86/surface_aggregator/ssh_parser.c | 228 ++ .../x86/surface_aggregator/ssh_parser.h | 154 + .../surface_aggregator/ssh_request_layer.c | 1263 ++++++++ .../surface_aggregator/ssh_request_layer.h | 143 + .../platform/x86/surface_aggregator/trace.h | 632 ++++ - .../platform/x86/surface_aggregator_cdev.c | 804 +++++ + .../platform/x86/surface_aggregator_cdev.c | 810 +++++ .../x86/surface_aggregator_registry.c | 606 ++++ drivers/platform/x86/surface_dtx.c | 1283 ++++++++ drivers/platform/x86/surface_perfmode.c | 122 + @@ -174,7 +174,7 @@ Patchset: surface-sam include/uapi/linux/surface_aggregator/dtx.h | 146 + scripts/mod/devicetable-offsets.c | 3 +- scripts/mod/file2alias.c | 10 +- - 57 files changed, 20038 insertions(+), 8 deletions(-) + 57 files changed, 20106 insertions(+), 8 deletions(-) create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst create mode 100644 Documentation/driver-api/surface_aggregator/client.rst create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst @@ -2940,7 +2940,7 @@ index 000000000000..4ae11cf09b25 +obj-$(CONFIG_SURFACE_KBD) += surface_kbd.o diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c new file mode 100644 -index 000000000000..3477b31611ae +index 000000000000..a3a70e4f3f6c --- /dev/null +++ b/drivers/hid/surface-hid/surface_hid.c @@ -0,0 +1,253 @@ @@ -3089,7 +3089,7 @@ index 000000000000..3477b31611ae + rqst.target_id = shid->uid.target; + rqst.instance_id = shid->uid.instance; + rqst.command_id = SURFACE_HID_CID_GET_FEATURE_REPORT; -+ rqst.flags = 0; ++ rqst.flags = SSAM_REQUEST_HAS_RESPONSE; + rqst.length = sizeof(rprt_id); + rqst.payload = &rprt_id; + @@ -5453,10 +5453,10 @@ index 000000000000..ed032c2cbdb2 +#endif /* _SURFACE_AGGREGATOR_BUS_H */ diff --git a/drivers/platform/x86/surface_aggregator/controller.c b/drivers/platform/x86/surface_aggregator/controller.c new file mode 100644 -index 000000000000..dec92cbe47fa +index 000000000000..68585c966de5 --- /dev/null +++ b/drivers/platform/x86/surface_aggregator/controller.c -@@ -0,0 +1,2727 @@ +@@ -0,0 +1,2789 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Main SSAM/SSH controller structure and functionality. @@ -5867,6 +5867,31 @@ index 000000000000..dec92cbe47fa +} + +/** ++ * ssam_nf_refcount_dec_free() - Decrement reference-/activation-count of the ++ * given event and free its entry if the reference count reaches zero. ++ * @nf: The notifier system reference. ++ * @reg: The registry used to enable/disable the event. ++ * @id: The event ID. ++ * ++ * Decrements the reference-/activation-count of the specified event, freeing ++ * its entry if it reaches zero. ++ * ++ * Note: ``nf->lock`` must be held when calling this function. ++ */ ++static void ssam_nf_refcount_dec_free(struct ssam_nf *nf, ++ struct ssam_event_registry reg, ++ struct ssam_event_id id) ++{ ++ struct ssam_nf_refcount_entry *entry; ++ ++ lockdep_assert_held(&nf->lock); ++ ++ entry = ssam_nf_refcount_dec(nf, reg, id); ++ if (entry && entry->refcount == 0) ++ kfree(entry); ++} ++ ++/** + * ssam_nf_refcount_empty() - Test if the notification system has any + * enabled/active events. + * @nf: The notification system. @@ -7582,6 +7607,109 @@ index 000000000000..dec92cbe47fa +/* -- Top-level event registry interface. ----------------------------------- */ + +/** ++ * ssam_nf_refcount_enable() - Enable event for reference count entry if it has ++ * not already been enabled. ++ * @ctrl: The controller to enable the event on. ++ * @entry: The reference count entry for the event to be enabled. ++ * @flags: The flags used for enabling the event on the EC. ++ * ++ * Enable the event associated with the given reference count entry if the ++ * reference count equals one, i.e. the event has not previously been enabled. ++ * If the event has already been enabled (i.e. reference count not equal to ++ * one), check that the flags used for enabling match and warn about this if ++ * they do not. ++ * ++ * This does not modify the reference count itself, which is done with ++ * ssam_nf_refcount_inc() / ssam_nf_refcount_dec(). ++ * ++ * Note: ``nf->lock`` must be held when calling this function. ++ * ++ * Return: Returns zero on success. If the event is enabled by this call, ++ * returns the status of the event-enable EC command. ++ */ ++static int ssam_nf_refcount_enable(struct ssam_controller *ctrl, ++ struct ssam_nf_refcount_entry *entry, u8 flags) ++{ ++ const struct ssam_event_registry reg = entry->key.reg; ++ const struct ssam_event_id id = entry->key.id; ++ struct ssam_nf *nf = &ctrl->cplt.event.notif; ++ int status; ++ ++ lockdep_assert_held(&nf->lock); ++ ++ ssam_dbg(ctrl, "enabling event (reg: %#04x, tc: %#04x, iid: %#04x, rc: %d)\n", ++ reg.target_category, id.target_category, id.instance, entry->refcount); ++ ++ if (entry->refcount == 1) { ++ status = ssam_ssh_event_enable(ctrl, reg, id, flags); ++ if (status) ++ return status; ++ ++ entry->flags = flags; ++ ++ } else if (entry->flags != flags) { ++ ssam_warn(ctrl, ++ "inconsistent flags when enabling event: got %#04x, expected %#04x (reg: %#04x, tc: %#04x, iid: %#04x)\n", ++ flags, entry->flags, reg.target_category, id.target_category, ++ id.instance); ++ } ++ ++ return 0; ++} ++ ++/** ++ * ssam_nf_refcount_disable_free() - Disable event for reference count entry if it is ++ * no longer in use and free the corresponding entry. ++ * @ctrl: The controller to disable the event on. ++ * @entry: The reference count entry for the event to be disabled. ++ * @flags: The flags used for enabling the event on the EC. ++ * ++ * If the reference count equals zero, i.e. the event is no longer requested by ++ * any client, the event will be disabled and the corresponding reference count ++ * entry freed. The reference count entry must not be used any more after a ++ * call to this function. ++ * ++ * Also checks if the flags used for disabling the event match the flags used ++ * for enabling the event and warns if they do not (regardless of reference ++ * count). ++ * ++ * This does not modify the reference count itself, which is done with ++ * ssam_nf_refcount_inc() / ssam_nf_refcount_dec(). ++ * ++ * Note: ``nf->lock`` must be held when calling this function. ++ * ++ * Return: Returns zero on success. If the event is disabled by this call, ++ * returns the status of the event-enable EC command. ++ */ ++static int ssam_nf_refcount_disable_free(struct ssam_controller *ctrl, ++ struct ssam_nf_refcount_entry *entry, u8 flags) ++{ ++ const struct ssam_event_registry reg = entry->key.reg; ++ const struct ssam_event_id id = entry->key.id; ++ struct ssam_nf *nf = &ctrl->cplt.event.notif; ++ int status = 0; ++ ++ lockdep_assert_held(&nf->lock); ++ ++ ssam_dbg(ctrl, "disabling event (reg: %#04x, tc: %#04x, iid: %#04x, rc: %d)\n", ++ reg.target_category, id.target_category, id.instance, entry->refcount); ++ ++ if (entry->flags != flags) { ++ ssam_warn(ctrl, ++ "inconsistent flags when disabling event: got %#04x, expected %#04x (reg: %#04x, tc: %#04x, iid: %#04x)\n", ++ flags, entry->flags, reg.target_category, id.target_category, ++ id.instance); ++ } ++ ++ if (entry->refcount == 0) { ++ status = ssam_ssh_event_disable(ctrl, reg, id, flags); ++ kfree(entry); ++ } ++ ++ return status; ++} ++ ++/** + * ssam_notifier_register() - Register an event notifier. + * @ctrl: The controller to register the notifier on. + * @n: The event notifier to register. @@ -7625,41 +7753,26 @@ index 000000000000..dec92cbe47fa + mutex_unlock(&nf->lock); + return PTR_ERR(entry); + } -+ -+ ssam_dbg(ctrl, "enabling event (reg: %#04x, tc: %#04x, iid: %#04x, rc: %d)\n", -+ n->event.reg.target_category, n->event.id.target_category, -+ n->event.id.instance, entry->refcount); + } + + status = ssam_nfblk_insert(nf_head, &n->base); + if (status) { -+ if (entry) { -+ entry = ssam_nf_refcount_dec(nf, n->event.reg, n->event.id); -+ if (entry->refcount == 0) -+ kfree(entry); -+ } ++ if (entry) ++ ssam_nf_refcount_dec_free(nf, n->event.reg, n->event.id); + + mutex_unlock(&nf->lock); + return status; + } + -+ if (entry && entry->refcount == 1) { -+ status = ssam_ssh_event_enable(ctrl, n->event.reg, n->event.id, n->event.flags); ++ if (entry) { ++ status = ssam_nf_refcount_enable(ctrl, entry, n->event.flags); + if (status) { + ssam_nfblk_remove(&n->base); -+ kfree(ssam_nf_refcount_dec(nf, n->event.reg, n->event.id)); ++ ssam_nf_refcount_dec_free(nf, n->event.reg, n->event.id); + mutex_unlock(&nf->lock); + synchronize_srcu(&nf_head->srcu); + return status; + } -+ -+ entry->flags = n->event.flags; -+ -+ } else if (entry && entry->flags != n->event.flags) { -+ ssam_warn(ctrl, -+ "inconsistent flags when enabling event: got %#04x, expected %#04x (reg: %#04x, tc: %#04x, iid: %#04x)\n", -+ n->event.flags, entry->flags, n->event.reg.target_category, -+ n->event.id.target_category, n->event.id.instance); + } + + mutex_unlock(&nf->lock); @@ -7706,35 +7819,20 @@ index 000000000000..dec92cbe47fa + * If this is an observer notifier, do not attempt to disable the + * event, just remove it. + */ -+ if (n->flags & SSAM_EVENT_NOTIFIER_OBSERVER) -+ goto remove; ++ if (!(n->flags & SSAM_EVENT_NOTIFIER_OBSERVER)) { ++ entry = ssam_nf_refcount_dec(nf, n->event.reg, n->event.id); ++ if (WARN_ON(!entry)) { ++ /* ++ * If this does not return an entry, there's a logic ++ * error somewhere: The notifier block is registered, ++ * but the event refcount entry is not there. Remove ++ * the notifier block anyways. ++ */ ++ status = -ENOENT; ++ goto remove; ++ } + -+ entry = ssam_nf_refcount_dec(nf, n->event.reg, n->event.id); -+ if (WARN_ON(!entry)) { -+ /* -+ * If this does not return an entry, there's a logic error -+ * somewhere: The notifier block is registered, but the event -+ * refcount entry is not there. Remove the notifier block -+ * anyways. -+ */ -+ status = -ENOENT; -+ goto remove; -+ } -+ -+ ssam_dbg(ctrl, "disabling event (reg: %#04x, tc: %#04x, iid: %#04x, rc: %d)\n", -+ n->event.reg.target_category, n->event.id.target_category, -+ n->event.id.instance, entry->refcount); -+ -+ if (entry->flags != n->event.flags) { -+ ssam_warn(ctrl, -+ "inconsistent flags when disabling event: got %#04x, expected %#04x (reg: %#04x, tc: %#04x, iid: %#04x)\n", -+ n->event.flags, entry->flags, n->event.reg.target_category, -+ n->event.id.target_category, n->event.id.instance); -+ } -+ -+ if (entry->refcount == 0) { -+ status = ssam_ssh_event_disable(ctrl, n->event.reg, n->event.id, n->event.flags); -+ kfree(entry); ++ status = ssam_nf_refcount_disable_free(ctrl, entry, n->event.flags); + } + +remove: @@ -7772,17 +7870,13 @@ index 000000000000..dec92cbe47fa + struct ssam_event_id id, u8 flags) +{ + u16 rqid = ssh_tc_to_rqid(id.target_category); ++ struct ssam_nf *nf = &ctrl->cplt.event.notif; + struct ssam_nf_refcount_entry *entry; -+ struct ssam_nf_head *nf_head; -+ struct ssam_nf *nf; + int status; + + if (!ssh_rqid_is_event(rqid)) + return -EINVAL; + -+ nf = &ctrl->cplt.event.notif; -+ nf_head = &nf->head[ssh_rqid_to_event(rqid)]; -+ + mutex_lock(&nf->lock); + + entry = ssam_nf_refcount_inc(nf, reg, id); @@ -7791,25 +7885,11 @@ index 000000000000..dec92cbe47fa + return PTR_ERR(entry); + } + -+ ssam_dbg(ctrl, "enabling event (reg: %#04x, tc: %#04x, iid: %#04x, rc: %d)\n", -+ reg.target_category, id.target_category, id.instance, -+ entry->refcount); -+ -+ if (entry->refcount == 1) { -+ status = ssam_ssh_event_enable(ctrl, reg, id, flags); -+ if (status) { -+ kfree(ssam_nf_refcount_dec(nf, reg, id)); -+ mutex_unlock(&nf->lock); -+ return status; -+ } -+ -+ entry->flags = flags; -+ -+ } else if (entry->flags != flags) { -+ ssam_warn(ctrl, -+ "inconsistent flags when enabling event: got %#04x, expected %#04x (reg: %#04x, tc: %#04x, iid: %#04x)\n", -+ flags, entry->flags, reg.target_category, -+ id.target_category, id.instance); ++ status = ssam_nf_refcount_enable(ctrl, entry, flags); ++ if (status) { ++ ssam_nf_refcount_dec_free(nf, reg, id); ++ mutex_unlock(&nf->lock); ++ return status; + } + + mutex_unlock(&nf->lock); @@ -7841,40 +7921,22 @@ index 000000000000..dec92cbe47fa + struct ssam_event_id id, u8 flags) +{ + u16 rqid = ssh_tc_to_rqid(id.target_category); ++ struct ssam_nf *nf = &ctrl->cplt.event.notif; + struct ssam_nf_refcount_entry *entry; -+ struct ssam_nf_head *nf_head; -+ struct ssam_nf *nf; -+ int status = 0; ++ int status; + + if (!ssh_rqid_is_event(rqid)) + return -EINVAL; + -+ nf = &ctrl->cplt.event.notif; -+ nf_head = &nf->head[ssh_rqid_to_event(rqid)]; -+ + mutex_lock(&nf->lock); + + entry = ssam_nf_refcount_dec(nf, reg, id); -+ if (WARN_ON(!entry)) { ++ if (!entry) { + mutex_unlock(&nf->lock); + return -ENOENT; + } + -+ ssam_dbg(ctrl, "disabling event (reg: %#04x, tc: %#04x, iid: %#04x, rc: %d)\n", -+ reg.target_category, id.target_category, id.instance, -+ entry->refcount); -+ -+ if (entry->flags != flags) { -+ ssam_warn(ctrl, -+ "inconsistent flags when disabling event: got %#04x, expected %#04x (reg: %#04x, tc: %#04x, iid: %#04x)\n", -+ flags, entry->flags, reg.target_category, -+ id.target_category, id.instance); -+ } -+ -+ if (entry->refcount == 0) { -+ status = ssam_ssh_event_disable(ctrl, reg, id, flags); -+ kfree(entry); -+ } ++ status = ssam_nf_refcount_disable_free(ctrl, entry, flags); + + mutex_unlock(&nf->lock); + return status; @@ -14259,10 +14321,10 @@ index 000000000000..de64cf169060 +#include diff --git a/drivers/platform/x86/surface_aggregator_cdev.c b/drivers/platform/x86/surface_aggregator_cdev.c new file mode 100644 -index 000000000000..2cad4147645c +index 000000000000..30fb50fde450 --- /dev/null +++ b/drivers/platform/x86/surface_aggregator_cdev.c -@@ -0,0 +1,804 @@ +@@ -0,0 +1,810 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Provides user-space access to the SSAM EC via the /dev/surface/aggregator @@ -14287,6 +14349,7 @@ index 000000000000..2cad4147645c + +#include +#include ++#include + +#define SSAM_CDEV_DEVICE_NAME "surface_aggregator_cdev" + @@ -14396,22 +14459,23 @@ index 000000000000..2cad4147645c + return 0; +} + -+static int ssam_cdev_notifier_register(struct ssam_cdev_client *client, u8 category, int priority) ++static int ssam_cdev_notifier_register(struct ssam_cdev_client *client, u8 tc, int priority) +{ ++ const u16 rqid = ssh_tc_to_rqid(tc); ++ const u16 event = ssh_rqid_to_event(rqid); + struct ssam_cdev_notifier *nf; -+ int index = ((int)category) - 1; + int status; + + lockdep_assert_held_read(&client->cdev->lock); + + /* Validate notifier target category. */ -+ if (index < 0 || index >= SSH_NUM_EVENTS) ++ if (!ssh_rqid_is_event(rqid)) + return -EINVAL; + + mutex_lock(&client->notifier_lock); + + /* Check if the notifier has already been registered. */ -+ if (client->notifier[index]) { ++ if (client->notifier[event]) { + mutex_unlock(&client->notifier_lock); + return -EEXIST; + } @@ -14432,7 +14496,7 @@ index 000000000000..2cad4147645c + nf->client = client; + nf->nf.base.fn = ssam_cdev_notifier; + nf->nf.base.priority = priority; -+ nf->nf.event.id.target_category = category; ++ nf->nf.event.id.target_category = tc; + nf->nf.event.mask = 0; /* Do not do any matching. */ + nf->nf.flags = SSAM_EVENT_NOTIFIER_OBSERVER; + @@ -14441,35 +14505,36 @@ index 000000000000..2cad4147645c + if (status) + kfree(nf); + else -+ client->notifier[index] = nf; ++ client->notifier[event] = nf; + + mutex_unlock(&client->notifier_lock); + return status; +} + -+static int ssam_cdev_notifier_unregister(struct ssam_cdev_client *client, u8 category) ++static int ssam_cdev_notifier_unregister(struct ssam_cdev_client *client, u8 tc) +{ -+ int index = ((int)category) - 1; ++ const u16 rqid = ssh_tc_to_rqid(tc); ++ const u16 event = ssh_rqid_to_event(rqid); + int status; + + lockdep_assert_held_read(&client->cdev->lock); + + /* Validate notifier target category. */ -+ if (index < 0 || index >= SSH_NUM_EVENTS) ++ if (!ssh_rqid_is_event(rqid)) + return -EINVAL; + + mutex_lock(&client->notifier_lock); + + /* Check if the notifier is currently registered. */ -+ if (!client->notifier[index]) { ++ if (!client->notifier[event]) { + mutex_unlock(&client->notifier_lock); + return -ENOENT; + } + + /* Unregister and free notifier. */ -+ status = ssam_notifier_unregister(client->cdev->ctrl, &client->notifier[index]->nf); -+ kfree(client->notifier[index]); -+ client->notifier[index] = NULL; ++ status = ssam_notifier_unregister(client->cdev->ctrl, &client->notifier[event]->nf); ++ kfree(client->notifier[event]); ++ client->notifier[event] = NULL; + + mutex_unlock(&client->notifier_lock); + return status; @@ -14747,6 +14812,9 @@ index 000000000000..2cad4147645c + + if (test_bit(SSAM_CDEV_DEVICE_SHUTDOWN_BIT, &cdev->flags)) { + up_write(&cdev->client_lock); ++ mutex_destroy(&client->write_lock); ++ mutex_destroy(&client->read_lock); ++ mutex_destroy(&client->notifier_lock); + ssam_cdev_put(client->cdev); + vfree(client); + return -ENODEV; @@ -20699,5 +20767,5 @@ index a6c583362b92..5b79fdc42641 100644 ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function); -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0007-surface-hotplug.patch b/patches/5.10/0007-surface-hotplug.patch index 1dae34743..f5784d846 100644 --- a/patches/5.10/0007-surface-hotplug.patch +++ b/patches/5.10/0007-surface-hotplug.patch @@ -1,4 +1,4 @@ -From 507101423da0c5f88d1a46c3c04fa38bb0ea4503 Mon Sep 17 00:00:00 2001 +From 00cfcf34ffb6f849c0d25161fe7e2b10913f7039 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 31 Oct 2020 20:46:33 +0100 Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state @@ -69,9 +69,9 @@ index d15c881e2e7e..b15f754e6346 100644 &dev_attr_vendor.attr, &dev_attr_device.attr, -- -2.31.1 +2.32.0 -From 251a97f43789e49dcbdf165a356d12640fa2d050 Mon Sep 17 00:00:00 2001 +From 45c7fa0b85ab62d6ba9404d52c189decf899528c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 14 Dec 2020 20:50:59 +0100 Subject: [PATCH] platform/x86: Add Surface Hotplug driver @@ -422,5 +422,5 @@ index 000000000000..cfcc15cfbacb +MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices"); +MODULE_LICENSE("GPL"); -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0008-surface-typecover.patch b/patches/5.10/0008-surface-typecover.patch index 336fe146d..b0417fb0e 100644 --- a/patches/5.10/0008-surface-typecover.patch +++ b/patches/5.10/0008-surface-typecover.patch @@ -1,4 +1,4 @@ -From a854425a8a53d494c59976e9165e3cbc6d580964 Mon Sep 17 00:00:00 2001 +From 3b001f083886f446d09b53c6e50d46d0a8aba5a4 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 @@ -34,7 +34,7 @@ Patchset: surface-typecover 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 8429ebe7097e..44d48e8bbe1a 100644 +index 8580ace596c2..06bfeb530250 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -34,7 +34,10 @@ @@ -106,7 +106,7 @@ index 8429ebe7097e..44d48e8bbe1a 100644 { } }; -@@ -1674,6 +1694,69 @@ static void mt_expired_timeout(struct timer_list *t) +@@ -1678,6 +1698,69 @@ static void mt_expired_timeout(struct timer_list *t) clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags); } @@ -176,7 +176,7 @@ index 8429ebe7097e..44d48e8bbe1a 100644 static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) { int ret, i; -@@ -1697,6 +1780,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) +@@ -1701,6 +1784,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN; hid_set_drvdata(hdev, td); @@ -186,7 +186,7 @@ index 8429ebe7097e..44d48e8bbe1a 100644 INIT_LIST_HEAD(&td->applications); INIT_LIST_HEAD(&td->reports); -@@ -1726,15 +1812,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) +@@ -1730,15 +1816,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) timer_setup(&td->release_timer, mt_expired_timeout, 0); ret = hid_parse(hdev); @@ -208,7 +208,7 @@ index 8429ebe7097e..44d48e8bbe1a 100644 ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group); if (ret) -@@ -1770,6 +1860,7 @@ static void mt_remove(struct hid_device *hdev) +@@ -1774,6 +1864,7 @@ static void mt_remove(struct hid_device *hdev) { struct mt_device *td = hid_get_drvdata(hdev); @@ -216,7 +216,7 @@ index 8429ebe7097e..44d48e8bbe1a 100644 del_timer_sync(&td->release_timer); sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group); -@@ -2121,6 +2212,11 @@ static const struct hid_device_id mt_devices[] = { +@@ -2125,6 +2216,11 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, @@ -229,5 +229,5 @@ index 8429ebe7097e..44d48e8bbe1a 100644 { .driver_data = MT_CLS_GOOGLE, HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE, -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0009-surface-go-touchscreen.patch b/patches/5.10/0009-surface-go-touchscreen.patch index eed42bfd9..30c2e3d06 100644 --- a/patches/5.10/0009-surface-go-touchscreen.patch +++ b/patches/5.10/0009-surface-go-touchscreen.patch @@ -1,4 +1,4 @@ -From 23169cca47f8985ad3b925efc7c13a8674586961 Mon Sep 17 00:00:00 2001 +From a07e995e536bcaabd26da837a949eb0c0886f6d3 Mon Sep 17 00:00:00 2001 From: Zoltan Tamas Vajda Date: Thu, 3 Jun 2021 10:50:55 +0200 Subject: [PATCH] Added quirk for Surface Go touchscreen @@ -35,5 +35,5 @@ index 32024905fd70..cfbb4ab4fd90 100644 }; -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0010-surface-sensors.patch b/patches/5.10/0010-surface-sensors.patch index a3e662b98..03419867b 100644 --- a/patches/5.10/0010-surface-sensors.patch +++ b/patches/5.10/0010-surface-sensors.patch @@ -1,4 +1,4 @@ -From 1949ada3849490e13b7a8e45d6ef80bd96822056 Mon Sep 17 00:00:00 2001 +From 59af08049130e46c98fbbf106447357dbdc320d6 Mon Sep 17 00:00:00 2001 From: Max Leiter Date: Sat, 19 Dec 2020 17:50:55 -0800 Subject: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in @@ -49,5 +49,5 @@ index 9afb3fcc74e6..20719141c03a 100644 .probe = apds9960_probe, .remove = apds9960_remove, -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0011-cameras.patch b/patches/5.10/0011-cameras.patch index a4d653156..b2c36aaaa 100644 --- a/patches/5.10/0011-cameras.patch +++ b/patches/5.10/0011-cameras.patch @@ -1,4 +1,4 @@ -From 72c7c946570e318419decd064193c3197de55371 Mon Sep 17 00:00:00 2001 +From bf6b665f1579fb436ca745663344b127399046f5 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 12 Oct 2020 21:04:11 +0300 Subject: [PATCH] ipu3-cio2: Use unsigned values where appropriate @@ -314,9 +314,9 @@ index 146492383aa5..7650d7998a3f 100644 struct cio2_csi2_timing { -- -2.31.1 +2.32.0 -From d9aa146c372862b5eadada9784e2d5dcf889cb08 Mon Sep 17 00:00:00 2001 +From 2f965eb69b34af54b2fceece9a2334ba59427bee Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 12 Oct 2020 21:04:12 +0300 Subject: [PATCH] ipu3-cio2: Remove explicit type from frame size checks @@ -348,9 +348,9 @@ index dcbfe8c9abc7..a1f574095acc 100644 mutex_lock(&q->subdev_lock); -- -2.31.1 +2.32.0 -From f61732bd739d5163afa6f0f72c3088b8e202e82a Mon Sep 17 00:00:00 2001 +From 50ff3d6761e43ec81efab6f1b1e6e7c3c3b59d42 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 12 Oct 2020 21:04:13 +0300 Subject: [PATCH] ipu3-cio2: Rename CIO2_IMAGE_MAX_LENGTH as @@ -407,9 +407,9 @@ index 7650d7998a3f..ccf0b85ae36f 100644 /* 32MB = 8xFBPT_entry */ #define CIO2_MAX_LOPS 8 -- -2.31.1 +2.32.0 -From 00f93cdb3520944dcb3965e92b02b701a108ff7c Mon Sep 17 00:00:00 2001 +From c84bd2ca8a16d7f2f81a4aeeedf1e23dbb2632a0 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Tue, 13 Oct 2020 17:25:35 +0300 Subject: [PATCH] ipu3-cio2: Check receved the size against payload size, not @@ -461,9 +461,9 @@ index 93fd25a5a3e9..b244b9de142a 100644 } atomic_inc(&q->frame_sequence); -- -2.31.1 +2.32.0 -From 6373aee3a8a2563b5c72320f9bec706ca6111a55 Mon Sep 17 00:00:00 2001 +From 5c90210c18f49e76b91cf55d34c2ee7dd24a42e6 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 30 Dec 2020 22:44:05 +0200 Subject: [PATCH] media: ipu3-cio2: Add headers that ipu3-cio2.h is direct user @@ -513,9 +513,9 @@ index ccf0b85ae36f..62187ab5ae43 100644 #define CIO2_DEVICE_NAME "Intel IPU3 CIO2" #define CIO2_ENTITY_NAME "ipu3-csi2" -- -2.31.1 +2.32.0 -From 38ff42a7122f0f191a7330973e0bde3f2da24caf Mon Sep 17 00:00:00 2001 +From 29f1cbbb652d61460bfbc7e6de6e5362a5bb45b0 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 24 Oct 2020 22:42:28 +0100 Subject: [PATCH] device property: Return true in fwnode_device_is_available @@ -558,9 +558,9 @@ index 4c43d30145c6..bc9c634df6df 100644 } EXPORT_SYMBOL_GPL(fwnode_device_is_available); -- -2.31.1 +2.32.0 -From 6b7655e71bcb794126b449b9a921cec2dde52908 Mon Sep 17 00:00:00 2001 +From bc8b4579c9c1e3b882a2234b596ba8f4b1fc75f4 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 21 Nov 2020 22:06:38 +0000 Subject: [PATCH] device property: Call fwnode_graph_get_endpoint_by_id() for @@ -602,9 +602,9 @@ index bc9c634df6df..ddba75d90af2 100644 EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id); -- -2.31.1 +2.32.0 -From f7801ce35dfa230703b43214b8a4aa851cb4a566 Mon Sep 17 00:00:00 2001 +From cb5f59643d22e0645b6ecbb087457aa902a29cd7 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 25 Oct 2020 22:49:08 +0000 Subject: [PATCH] software_node: Enforce parent before child ordering of nodes @@ -705,9 +705,9 @@ index 206bd4d7d7e2..eb89bdb9232c 100644 } EXPORT_SYMBOL_GPL(software_node_unregister_nodes); -- -2.31.1 +2.32.0 -From 33d65c9f6c967d25f9fbfb9e8d3efc1b10288cc0 Mon Sep 17 00:00:00 2001 +From e2b3e58a0342a8a8977f6557d8658c4e68e0987b Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 21 Oct 2020 22:25:03 +0100 Subject: [PATCH] software_node: unregister software_nodes in reverse order @@ -760,9 +760,9 @@ index eb89bdb9232c..032b24f60c78 100644 } EXPORT_SYMBOL_GPL(software_node_unregister_node_group); -- -2.31.1 +2.32.0 -From 4c87b6a4734d9629abaa3737f18bf564d0a4852e Mon Sep 17 00:00:00 2001 +From 99b2d1e37f197fb6fa7897764d3485719fdc0f51 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Tue, 22 Dec 2020 13:09:05 +0000 Subject: [PATCH] device property: Define format macros for ports and endpoints @@ -801,9 +801,9 @@ index 9506f8ec0974..72d36d46287d 100644 /** -- -2.31.1 +2.32.0 -From e864ead9ebbb63077cfdc0c695d744cd96978725 Mon Sep 17 00:00:00 2001 +From 6a098a6d7bce0dbbb72d5e075a652668fa0cc725 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Tue, 15 Sep 2020 15:47:46 +0100 Subject: [PATCH] software_node: Add support for fwnode_graph*() family of @@ -969,9 +969,9 @@ index 032b24f60c78..7f056c5e0ed3 100644 /* -------------------------------------------------------------------------- */ -- -2.31.1 +2.32.0 -From 85aebfa83d8111ccb19588560561d887548e2254 Mon Sep 17 00:00:00 2001 +From e08d3490b25fa1bb4f47736e9bb0a1b1a4a4c49f Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Oct 2020 23:07:22 +0100 Subject: [PATCH] lib/test_printf.c: Use helper function to unwind array of @@ -1007,9 +1007,9 @@ index 7ac87f18a10f..7d60f24240a4 100644 static void __init -- -2.31.1 +2.32.0 -From a866ae79b569d667717e1b7fc9d89e74810ad26a Mon Sep 17 00:00:00 2001 +From 68f8d5b8ab3a96c08b33e9359cdecf7e0b76f76b Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Oct 2020 23:11:36 +0100 Subject: [PATCH] ipu3-cio2: Add T: entry to MAINTAINERS @@ -1038,9 +1038,9 @@ index 4fef10dd2975..7ac7d1ae8764 100644 F: drivers/media/pci/intel/ipu3/ -- -2.31.1 +2.32.0 -From 5caff052bb6157cfc8a52506285cd54220e498e2 Mon Sep 17 00:00:00 2001 +From c8e091001df85e944f6e5b2bf2c3706954eaca4d Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 10 Oct 2020 22:47:21 +0100 Subject: [PATCH] ipu3-cio2: Rename ipu3-cio2.c @@ -1073,9 +1073,9 @@ similarity index 100% rename from drivers/media/pci/intel/ipu3/ipu3-cio2.c rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c -- -2.31.1 +2.32.0 -From e36f28d5d30e50c733083da2e421ca8f35d6adf5 Mon Sep 17 00:00:00 2001 +From bf9f0e456ffb43e50be5888af270aa5b726d9505 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 21 Oct 2020 21:53:05 +0100 Subject: [PATCH] media: v4l2-core: v4l2-async: Check sd->fwnode->secondary in @@ -1114,9 +1114,9 @@ index e3ab003a6c85..9dd896d085ec 100644 * Otherwise, check if the sd fwnode and the asd fwnode refer to an * endpoint or a device. If they're of the same type, there's no match. -- -2.31.1 +2.32.0 -From 29d96d8f1d2e145985476e58fb18806467378e2a Mon Sep 17 00:00:00 2001 +From 4d811aa7fa9d61d27a2f08c014af9c350c2adbd3 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 15 Nov 2020 08:15:34 +0000 Subject: [PATCH] ACPI / bus: Add acpi_dev_get_next_match_dev() and helper @@ -1223,9 +1223,9 @@ index 37dac195adbb..f28b097c658f 100644 { put_device(&adev->dev); -- -2.31.1 +2.32.0 -From d04cdac83e1d685531b29cb2270accd93052aba2 Mon Sep 17 00:00:00 2001 +From 8a708afcaedb5fda96828dec71991d0d4db57514 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 19 Dec 2020 23:55:04 +0000 Subject: [PATCH] media: v4l2-fwnode: Include v4l2_fwnode_bus_type @@ -1300,9 +1300,9 @@ index ed0840f3d5df..6ca337c28b3c 100644 * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties * @fwnode: pointer to the endpoint's fwnode handle -- -2.31.1 +2.32.0 -From d718c386314e36faa1788c5072e46a2cfb1fc27e Mon Sep 17 00:00:00 2001 +From d5d7572acf69c3ad5b20efe3b462dd7e8761dc2e Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 21 Oct 2020 21:53:44 +0100 Subject: [PATCH] ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver @@ -1898,9 +1898,9 @@ index 62187ab5ae43..dc3e343a37fb 100644 + #endif -- -2.31.1 +2.32.0 -From 7279aab5cb97cb59f12a2ab928a923cf9c8ea1c0 Mon Sep 17 00:00:00 2001 +From c6985d827f4c2d504ea5bed3aa122521052f3444 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 2 Dec 2020 12:38:10 +0000 Subject: [PATCH] acpi: utils: move acpi_lpss_dep() to utils @@ -2000,9 +2000,9 @@ index ddca1550cce6..78b38775f18b 100644 * acpi_dev_present - Detect that a given ACPI device is present * @hid: Hardware ID of the device. -- -2.31.1 +2.32.0 -From 60e395394d54d5e8f56b8ba26dbe74ed10e8a678 Mon Sep 17 00:00:00 2001 +From 415e2bd747859bd7b1a0b91eca49ac106c602382 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 26 Nov 2020 21:12:41 +0000 Subject: [PATCH] acpi: utils: Add function to fetch dependent acpi_devices @@ -2086,9 +2086,9 @@ index f28b097c658f..9bec3373f850 100644 acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv); struct acpi_device * -- -2.31.1 +2.32.0 -From 9f451eca1c77301234fb1070c1b331be833a4cb4 Mon Sep 17 00:00:00 2001 +From cf03f0bf135d64d389e96e79a8672767534cc6a2 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 16 Nov 2020 21:38:49 +0000 Subject: [PATCH] i2c: i2c-core-base: Use format macro in i2c_dev_set_name() @@ -2154,9 +2154,9 @@ index a670ae129f4b..b18172f240af 100644 { return NULL; -- -2.31.1 +2.32.0 -From 4ce96887f2bcc2fd261baf8cb9c157290ba76860 Mon Sep 17 00:00:00 2001 +From dcf1977e7092b2d8cbd1bd4efb66774c1b9f6022 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 2 Dec 2020 16:41:42 +0000 Subject: [PATCH] i2c: i2c-core-acpi: Add i2c_acpi_dev_name() @@ -2212,9 +2212,9 @@ index b18172f240af..269a2009080c 100644 #else static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, -- -2.31.1 +2.32.0 -From 1ea3cc74c06de532e8d94ec330e78d34a69f889e Mon Sep 17 00:00:00 2001 +From 16351599ab95b333a50da21e986a004f0fdafd1d Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 16 Nov 2020 00:16:56 +0000 Subject: [PATCH] gpio: gpiolib-acpi: Export acpi_get_gpiod() @@ -2276,9 +2276,9 @@ index fdb1d5262ce8..817f53506cfe 100644 static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) -- -2.31.1 +2.32.0 -From d1362f8a46a3c98e376497c85f40b9855dad2e4b Mon Sep 17 00:00:00 2001 +From 1d7362a71492ad2ce651be311bfbb1097c35bb35 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 12 Dec 2020 23:56:59 +0000 Subject: [PATCH] mfd: Remove tps68470 MFD driver @@ -2467,9 +2467,9 @@ index 4a4df4ffd18c..000000000000 -}; -builtin_i2c_driver(tps68470_driver); -- -2.31.1 +2.32.0 -From ce5a522fdd3f7ec7524927bab8f0ba1c13c68d2b Mon Sep 17 00:00:00 2001 +From 04600bcdf356e968e8f216a5f2a99d4a4f677c80 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 15 Jan 2021 12:37:31 +0000 Subject: [PATCH] platform: x86: Add intel_skl_int3472 driver @@ -3436,9 +3436,9 @@ index 000000000000..3fe27ec0caff + return ret; +} -- -2.31.1 +2.32.0 -From 6dae4822587d147c175d81afde01addd751bd451 Mon Sep 17 00:00:00 2001 +From 1b271c165365b6b3f1028099cf57d8823539cf37 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 11 Dec 2020 21:17:35 +0100 Subject: [PATCH] PCI: ACPI: Fix up ACPI companion lookup for device 0 on the @@ -3506,9 +3506,9 @@ index 745a4e0c4994..87e45a800919 100644 /** -- -2.31.1 +2.32.0 -From 1eb9a156b3ffae11b2d85f1f34b899831593b8e6 Mon Sep 17 00:00:00 2001 +From 574fb78a0c5ebd53b750ae4742339959e042b8c4 Mon Sep 17 00:00:00 2001 From: Jake Day Date: Fri, 25 Sep 2020 10:24:53 -0400 Subject: [PATCH] media: i2c: Add support for the OV5693 image sensor @@ -6863,9 +6863,9 @@ index 000000000000..9a508e1f3624 +static unsigned long N_RES = N_RES_VIDEO; +#endif -- -2.31.1 +2.32.0 -From 8abda27560ccb7fae1ae7694dff1dc11d0698c68 Mon Sep 17 00:00:00 2001 +From 650c0af0cfb110a129d39962e61fd4ebfff0cf45 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 17 Jan 2021 19:08:18 +0000 Subject: [PATCH] media: i2c: Add reset pin toggling to ov5693 @@ -6904,9 +6904,9 @@ index 32485e4ed42b..f9ced52ad37a 100644 if (dev->indicator_led) -- -2.31.1 +2.32.0 -From c5979bea3a2c94ec2c40b0c211ee969e6cd8a7a7 Mon Sep 17 00:00:00 2001 +From b10103601c4d0cb981143985a9a1f8e4d43db052 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 17 Jan 2021 21:39:15 +0000 Subject: [PATCH] media: i2c: Fix misnamed variable in power_down() for ov5693 @@ -6933,9 +6933,9 @@ index f9ced52ad37a..9fd44a3d1d85 100644 clk_disable_unprepare(dev->clk); -- -2.31.1 +2.32.0 -From 68f3ba0117a5825767534b2bb977005231e2e3c2 Mon Sep 17 00:00:00 2001 +From 180bc34d58cce8989cde368cb1959931d54e7684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= Date: Fri, 22 Jan 2021 20:58:13 +0100 Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation @@ -7096,9 +7096,9 @@ index dd0ffcafa489..924d99d20328 100644 struct property_entry ep_properties[5]; struct property_entry dev_properties[3]; -- -2.31.1 +2.32.0 -From 3c8ea6db7d503e8c952ce05d47cfd96e136e2215 Mon Sep 17 00:00:00 2001 +From 29a420b956be217aaaf3bc6892e2b6ee49f7ecd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= Date: Fri, 22 Jan 2021 21:23:47 +0100 Subject: [PATCH] ov5693: Add orientation and rotation controls @@ -7152,9 +7152,9 @@ index 9fd44a3d1d85..1a85800df7ed 100644 ov5693->ctrl_handler.lock = &ov5693->input_lock; ov5693->sd.ctrl_handler = &ov5693->ctrl_handler; -- -2.31.1 +2.32.0 -From fa3fe24fa91baa96a3a36021146fd8ebab184521 Mon Sep 17 00:00:00 2001 +From 4bfb6935b534422ca932cf3af10b4127e6d5abf3 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 23 Jan 2021 00:28:32 +0000 Subject: [PATCH] platform: x86: Stylistic updates for intel-skl-int3472 @@ -7569,9 +7569,9 @@ index 3fe27ec0caff..40629291b339 100644 return -EINVAL; -- -2.31.1 +2.32.0 -From d1f598fd13b5d055a0d5e4e9bd1f186db5fe9933 Mon Sep 17 00:00:00 2001 +From 51fa050a09c7a429589f2346ee60454083f71c8e Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 23 Jan 2021 00:30:15 +0000 Subject: [PATCH] platform: x86: Add recalc_rate opp to int3472-discrete clock @@ -7696,9 +7696,9 @@ index 42ae8396eb64..98eb1ec3399e 100644 acpi_dev_put(int3472->sensor); -- -2.31.1 +2.32.0 -From eb5de8b05f3adae60d5acbfa56fc876cac06f096 Mon Sep 17 00:00:00 2001 +From 47a5bf65716723b733b86233aa95d41f023d1414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= Date: Sun, 24 Jan 2021 11:07:42 +0100 Subject: [PATCH] cio2-bridge: Use macros and add warnings @@ -7800,9 +7800,9 @@ index 924d99d20328..e1e388cc9f45 100644 (const struct cio2_sensor_config) { \ .hid = _HID, \ -- -2.31.1 +2.32.0 -From b1b4f3518c02e23d6ca23442aa6d533e43431859 Mon Sep 17 00:00:00 2001 +From 005339e57c5047fcdf0749ddcc971d3ca5660cde Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 8 Feb 2021 21:44:38 +0000 Subject: [PATCH] media: i2c: Tidy up ov5693_init_controls() @@ -7922,9 +7922,9 @@ index 9a508e1f3624..26819cf3f4d2 100644 enum ov5693_tok_type { -- -2.31.1 +2.32.0 -From 3f0eefb6e6572fa459d79649e8dc73c39ac96fee Mon Sep 17 00:00:00 2001 +From 9744e6b7fdee1f1fc37f6657e0ccd4f48d7f2568 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 8 Feb 2021 21:46:49 +0000 Subject: [PATCH] media: i2c: Remove OV5693_PPL_DEFAULT @@ -7960,9 +7960,9 @@ index a9747ab783d7..7fb368eec327 100644 V4L2_CID_HBLANK, hblank, hblank, 1, hblank); -- -2.31.1 +2.32.0 -From 7c061c6b6fa86ab40b7757a1f91703f8c81138f6 Mon Sep 17 00:00:00 2001 +From c09233f48986792812607aeb27101172c8ada690 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 8 Feb 2021 22:53:02 +0000 Subject: [PATCH] media: i2c: Add vblank control to ov5693 driver @@ -8036,9 +8036,9 @@ index 26819cf3f4d2..9d7eed97963b 100644 }; -- -2.31.1 +2.32.0 -From 80684fc2222913b5e05c4cf1b249564ea58074a7 Mon Sep 17 00:00:00 2001 +From 965db8c75ac727366ca36318660d91ee83d33322 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 10 Feb 2021 00:36:32 +0000 Subject: [PATCH] media: i2c: update exposure control for ov5693 @@ -8111,9 +8111,9 @@ index 1950d7ac2d54..cea767230aa9 100644 /* Gain */ -- -2.31.1 +2.32.0 -From d90e17f6438e1987f70a5b3a7a44bfbd95f26847 Mon Sep 17 00:00:00 2001 +From 99128ca78c046041a402b36fe7130ae8454a67e9 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 10 Feb 2021 00:39:42 +0000 Subject: [PATCH] media: i2c: Fix incorrect bit-setting @@ -8147,9 +8147,9 @@ index cea767230aa9..f681dbfcec56 100644 #define OV5693_GAIN_CTRL_H_REG 0x3504 -- -2.31.1 +2.32.0 -From da39b6e34fadf45a010d52ac1c4946da6f474831 Mon Sep 17 00:00:00 2001 +From 3c60c42d75cf8215a99d2f06611898c07b1ba7f3 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 10 Feb 2021 16:25:48 +0000 Subject: [PATCH] media: i2c: Don't set stream on during mode config @@ -8297,9 +8297,9 @@ index 9d7eed97963b..965208078c2b 100644 }; -- -2.31.1 +2.32.0 -From 17a6811e598982b5a6a56b304ab7617a072896b7 Mon Sep 17 00:00:00 2001 +From 37e1b0047b2085bb916620529692db84b7b6ffc5 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 10 Feb 2021 16:35:24 +0000 Subject: [PATCH] media: i2c: Update gain control for ov5693 @@ -8369,9 +8369,9 @@ index f681dbfcec56..51eb3b05d121 100644 /* Flip */ -- -2.31.1 +2.32.0 -From a4de43acabfc0fec1a68c9ccd89222b9bd5ae90d Mon Sep 17 00:00:00 2001 +From e6e913e136ab2baa0ef349ba89b29b5552251203 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 10 Feb 2021 23:44:39 +0000 Subject: [PATCH] media: i2c: Fixup gain read @@ -8432,9 +8432,9 @@ index 51eb3b05d121..952558c4f33b 100644 } -- -2.31.1 +2.32.0 -From 99adb8d913ef4cd426168cd1c23621c2dda34341 Mon Sep 17 00:00:00 2001 +From f6abb08a2daa0d90c9dd08c0dfbb957ce7b3eae1 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 11 Feb 2021 00:40:10 +0000 Subject: [PATCH] media: i2c: Update controls on stream @@ -8467,9 +8467,9 @@ index 952558c4f33b..dd31083eeb7b 100644 enable ? OV5693_START_STREAMING : OV5693_STOP_STREAMING); -- -2.31.1 +2.32.0 -From 0f0e77aeb3ad8464bc0a6bfa7360bc6b48156f9a Mon Sep 17 00:00:00 2001 +From ffed81b97ce6ae2d12a23513368353f427f77b9d Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 11 Feb 2021 23:29:15 +0000 Subject: [PATCH] media: i2c: Correct link frequency value @@ -8506,9 +8506,9 @@ index 965208078c2b..7f1d31a82d3d 100644 #define OV5693_NUM_SUPPLIES 2 -- -2.31.1 +2.32.0 -From 62f5c0b7546fc3264b424a1a0ac41135bb8f724e Mon Sep 17 00:00:00 2001 +From 555393e23cd3d8531c08ab6e349001c98d0e27fd Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 25 Jan 2021 23:12:09 +0000 Subject: [PATCH] media: i2c: Cleanup ov5693 driver @@ -9427,9 +9427,9 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644 struct regulator_bulk_data supplies[OV5693_NUM_SUPPLIES]; struct clk *clk; -- -2.31.1 +2.32.0 -From 9e4dc97237c70fcad5811e57d2e3457ae34e9b66 Mon Sep 17 00:00:00 2001 +From 3ec133a06e3406cd00a22b7ca6115106433659da Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Jan 2021 12:04:38 +0000 Subject: [PATCH] media: i2c: Add pm_runtime support to ov5693 driver @@ -9772,9 +9772,9 @@ index 70ccb3aae4c7..b78d3b474a43 100644 struct camera_sensor_platform_data *platform_data; ktime_t timestamp_t_focus_abs; -- -2.31.1 +2.32.0 -From 650246fc29599f6dcdda8604b4518839c0380f98 Mon Sep 17 00:00:00 2001 +From bda29d54aac421fb575c8b20ceb2017100c76bff Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Jan 2021 12:07:36 +0000 Subject: [PATCH] media: i2c: Remove old power methods from ov5693 @@ -9943,9 +9943,9 @@ index f2eaa5f71a31..ce26ce86fbd5 100644 .pad = &ov5693_pad_ops, }; -- -2.31.1 +2.32.0 -From c6d99805976f08c88879ffa261ff46edff08ee86 Mon Sep 17 00:00:00 2001 +From 697ead7019038fecdba91a7a312510d01c2e07d2 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Jan 2021 12:14:00 +0000 Subject: [PATCH] media: i2c: Trim unused headers from ov5693 @@ -9984,9 +9984,9 @@ index ce26ce86fbd5..b3b391a49fdb 100644 #include -- -2.31.1 +2.32.0 -From d8fc2837967eeae3acc9344986ee956f3717b3f0 Mon Sep 17 00:00:00 2001 +From 6eeda53defe27755d78c04232130f7a1c678a344 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 13 Feb 2021 21:39:35 +0000 Subject: [PATCH] media: i2c: Remove VCM stuff @@ -10403,9 +10403,9 @@ index b3b391a49fdb..2c82b6578de9 100644 v4l2_i2c_subdev_init(&ov5693->sd, client, &ov5693_ops); -- -2.31.1 +2.32.0 -From 70be51acbf829d64c93f8f15742966a0eeb2b1aa Mon Sep 17 00:00:00 2001 +From 69a03896550552256b4d3cbd33186f3efc1e7557 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 13 Feb 2021 22:16:08 +0000 Subject: [PATCH] media: i2c: Tidy up ov5693 sensor init @@ -10559,9 +10559,9 @@ index 2c82b6578de9..313bc9177328 100644 mutex_unlock(&ov5693->lock); return ret; -- -2.31.1 +2.32.0 -From 0fdc128f2dc247b70b1f6ad3e57255174845cc0d Mon Sep 17 00:00:00 2001 +From 0731af2d0b942c19a6aaa6f3b5aada7c301f02bd Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 12 Feb 2021 16:14:04 +0000 Subject: [PATCH] media: i2c: cleanup macros in ov5693.h @@ -10705,9 +10705,9 @@ index b78d3b474a43..6502777eb5f3 100644 #define OV5693_FRAME_OFF_NUM 0x4202 #define OV5693_OTP_BYTE_MAX 32 //change to 32 as needed by otpdata -- -2.31.1 +2.32.0 -From 8bca0437a19e7dd1b23e34fb15c129fb279d989e Mon Sep 17 00:00:00 2001 +From 6633cff2c875aa5cf5a18e2ba459dd0605134996 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 12 Feb 2021 16:19:09 +0000 Subject: [PATCH] media: i2c: use devm_kzalloc() to initialise ov5693 @@ -10735,9 +10735,9 @@ index 313bc9177328..d092ed698eb3 100644 return -ENOMEM; -- -2.31.1 +2.32.0 -From 8d163d7f85a79da5ab4ddbd9a3f07dcb6002353f Mon Sep 17 00:00:00 2001 +From 66a6c7c347b8160eafb9d140e5ccc285bb300ff0 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Fri, 12 Feb 2021 16:26:21 +0000 Subject: [PATCH] media: i2c: Check for supported clk rate in probe @@ -10792,9 +10792,9 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644 #define OV5693_LINK_FREQ_400MHZ 400000000 /* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample -- -2.31.1 +2.32.0 -From cdca6c76396c6d22e160aa7a3b26f7964771afeb Mon Sep 17 00:00:00 2001 +From 092521d1bd60de637a2f0c8fdb56eb5213a282bc Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 13 Feb 2021 23:17:50 +0000 Subject: [PATCH] media: i2c: Use devres to fetch gpios @@ -10866,9 +10866,9 @@ index 8082d37841da..c580159079d2 100644 static int ov5693_get_regulators(struct ov5693_device *ov5693) -- -2.31.1 +2.32.0 -From 5cfa65204983a478ab9675f0225c339381d3838e Mon Sep 17 00:00:00 2001 +From 5ede7a9a4866f3a7c8f971198163e3a99d0510c5 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sat, 13 Feb 2021 23:20:47 +0000 Subject: [PATCH] media: i2c: Use devres to fetch regulators @@ -10909,9 +10909,9 @@ index c580159079d2..9f61b470f8ba 100644 ov5693->supplies); } -- -2.31.1 +2.32.0 -From 3582f5537b59a5317173e30f36bd1e13ead5e356 Mon Sep 17 00:00:00 2001 +From aca73b47a8c844edc1e6e2ac67160eb1235292bb Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 14 Feb 2021 12:39:14 +0000 Subject: [PATCH] media: i2c: remove debug print @@ -10988,9 +10988,9 @@ index 9f61b470f8ba..622a7ddf4063 100644 return 0; } -- -2.31.1 +2.32.0 -From 81774aff20cea424f25599c8028bbd2b9f183ac1 Mon Sep 17 00:00:00 2001 +From 3c5445d16e955305f2bd80a077b75b0dfcb9dcf3 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 14 Feb 2021 14:32:50 +0000 Subject: [PATCH] media: i2c: Remove unused resolutions from ov5693 @@ -11417,9 +11417,9 @@ index 0dfbbe9a0ff2..29e6735112da 100644 static unsigned long N_RES = N_RES_VIDEO; -#endif -- -2.31.1 +2.32.0 -From 500091bb0a62242df3208c0d1094ef30a222c611 Mon Sep 17 00:00:00 2001 +From 7d39a9238d1de10e32c5a424830ae168abd1fc8b Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 14 Feb 2021 14:45:58 +0000 Subject: [PATCH] media: i2c: update set_fmt() for ov5693 @@ -11658,5 +11658,5 @@ index 29e6735112da..0377853f8b2b 100644 int otp_size; u8 *otp_data; -- -2.31.1 +2.32.0 diff --git a/patches/5.10/0012-ath10k-firmware-override.patch b/patches/5.10/0012-ath10k-firmware-override.patch index 2f526378f..f896f41eb 100644 --- a/patches/5.10/0012-ath10k-firmware-override.patch +++ b/patches/5.10/0012-ath10k-firmware-override.patch @@ -1,4 +1,4 @@ -From 821b9324a694af4520cfb25179bcb30494c2d1b4 Mon Sep 17 00:00:00 2001 +From 35eaa7d3bff4cc1cd1c41ce3acb8c0615db2ac57 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 d73ad60b571c..f242fd4b81a6 100644 ret = firmware_request_nowarn(&fw, filename, ar->dev); ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", -- -2.31.1 +2.32.0