diff --git a/patches/5.11/0001-surface3-oemb.patch b/patches/5.11/0001-surface3-oemb.patch index ee6bc0ac9..1466cb73a 100644 --- a/patches/5.11/0001-surface3-oemb.patch +++ b/patches/5.11/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From d3ae08c58e8ee31d5b0cc8b83943ec17f291eec9 Mon Sep 17 00:00:00 2001 +From 2d34198bd6fc6588aae1ecf4b610a7065682d6bd 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.0 +2.31.1 diff --git a/patches/5.11/0002-wifi.patch b/patches/5.11/0002-wifi.patch index f6db0e32c..3ac8af8b4 100644 --- a/patches/5.11/0002-wifi.patch +++ b/patches/5.11/0002-wifi.patch @@ -1,4 +1,4 @@ -From f46be9ffd2914cec4593067da550ffc426ba828c Mon Sep 17 00:00:00 2001 +From da6c25854f3ef00797fb40e653a5964e0dce6b2f 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.0 +2.31.1 -From 7f9280d5497d4dfec2c494f0797ad0ed10e64a10 Mon Sep 17 00:00:00 2001 +From 7532907d1298e827ff4dc7bc2132eed429594883 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.0 +2.31.1 -From 3f5a82f5a39d98e51f747415ae7746766b3c6971 Mon Sep 17 00:00:00 2001 +From 9929f774e25116fee4af87f189d54ff919c9f3bf 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.0 +2.31.1 -From dbd310b9c656233985765614aeeebb9533957482 Mon Sep 17 00:00:00 2001 +From bd58ed56e292fb5c89808372920dce38d8ae307c 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.0 +2.31.1 -From a59d938fac929cc34a0cb0bcb2489fde92af12d2 Mon Sep 17 00:00:00 2001 +From 50d7d42bc4760fe8bdb5f3c6de19546b58f495f9 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.0 +2.31.1 -From e77c4bb867183feb91cb25e1315fc90191454b5f Mon Sep 17 00:00:00 2001 +From 3fc5e7079ea19a5aceb6e6f58c4fc60130e7924d 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 @@ -968,9 +968,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.0 +2.31.1 -From ef2eea8b78ab6c4aceff7d7a7be5a82193425c51 Mon Sep 17 00:00:00 2001 +From 5b27ea4b64d67830c37fb0f82a6c184e0d3e16bb 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 @@ -1046,9 +1046,9 @@ index a4f834a50a98..e276f84a41bd 100644 (id->driver_info & BTUSB_MEDIATEK)) { hdev->setup = btusb_mtk_setup; -- -2.31.0 +2.31.1 -From a9fcadb8c659155a884f4560c19bbbad38c51db0 Mon Sep 17 00:00:00 2001 +From 8a5a37d62dffc43c40a6e3d66b3105205fd9fd3f 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 @@ -1147,9 +1147,9 @@ index a6b9dc6700b1..d50fd8570475 100644 mwifiex_dbg(priv->adapter, ERROR, "%s: changing to %d not supported\n", -- -2.31.0 +2.31.1 -From 7a0a5f2c57d7ee8734717fddc809fc841af24996 Mon Sep 17 00:00:00 2001 +From 7683c74cde755b376be8de6b4a7abc7ca65f0412 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 @@ -1380,9 +1380,9 @@ index d50fd8570475..3a79a55bbfd2 100644 static void -- -2.31.0 +2.31.1 -From 66684e715db286f46230c5f9f157ee4b7203575a Mon Sep 17 00:00:00 2001 +From 8666a053f5a5eeb191e26e6d618bf819046cdf6b 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 @@ -1448,9 +1448,9 @@ index 3a79a55bbfd2..66e978088061 100644 params); default: -- -2.31.0 +2.31.1 -From 8a9fd20406edff99502a114fc630cd35556e0421 Mon Sep 17 00:00:00 2001 +From 7ee7277603569f97bbd365738eb58abb909551eb 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 @@ -1624,9 +1624,9 @@ index 66e978088061..db30f595e9f9 100644 priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED; -- -2.31.0 +2.31.1 -From 8c4ed414d5dfc88289cb79a772d952276fe9abd5 Mon Sep 17 00:00:00 2001 +From f4995ff07f9a83415bd8fbc06c5dc324f36f6cc0 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 @@ -1727,9 +1727,9 @@ index db30f595e9f9..60de1cec77c7 100644 } /* -- -2.31.0 +2.31.1 -From 30db63046507c9c2f8b4c761366b5341a86809ff Mon Sep 17 00:00:00 2001 +From a0806aff34bbec751eeada2a03ca828a4c859de7 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 @@ -1816,9 +1816,9 @@ index 60de1cec77c7..a37b504bd084 100644 return mwifiex_change_vif_to_ap(dev, curr_iftype, type, params); -- -2.31.0 +2.31.1 -From dd92b70177a8b7b457d9eddcc373aeaa8073ecc0 Mon Sep 17 00:00:00 2001 +From 3954ba40db395bf522fcf6b450797e7b15c5f8e5 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 @@ -1843,9 +1843,9 @@ index a37b504bd084..e65f285e3efe 100644 type, params); break; -- -2.31.0 +2.31.1 -From abedd26878159cf75b6f303164eb678803e8d591 Mon Sep 17 00:00:00 2001 +From 5e245d9000928d583b7e12b5ba8fbbf52347d42d 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 @@ -1898,9 +1898,9 @@ index e65f285e3efe..a290312313f3 100644 default: mwifiex_dbg(adapter, ERROR, -- -2.31.0 +2.31.1 -From 3ecb0807a4af4e8bf90aa27e984dbecd3dd6f357 Mon Sep 17 00:00:00 2001 +From 92e5b7074d35bcee9df10e2efcdc4c09361f2ed1 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 @@ -1930,9 +1930,9 @@ index a290312313f3..1e1cf523e228 100644 priv->bss_started = 0; -- -2.31.0 +2.31.1 -From c8308fa6952959f216d22802e42d162a2db66858 Mon Sep 17 00:00:00 2001 +From 348920bfbb59bce0cfcdee216829b85921c8f1f1 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 @@ -1987,9 +1987,9 @@ index 9ac12ff4a5c1..4123c8bb6b6f 100644 } -- -2.31.0 +2.31.1 -From 27ff118a76d7319446a6a88c6333b64b4521d563 Mon Sep 17 00:00:00 2001 +From c7c104e1977179e7e948095579775929f0abfe98 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 @@ -2076,5 +2076,5 @@ index 4123c8bb6b6f..b5491509d6a2 100644 if (reg->sleep_cookie) { mwifiex_pcie_dev_wakeup_delay(adapter); -- -2.31.0 +2.31.1 diff --git a/patches/5.11/0003-ipts.patch b/patches/5.11/0003-ipts.patch index e8963c2fd..8c9b7d27d 100644 --- a/patches/5.11/0003-ipts.patch +++ b/patches/5.11/0003-ipts.patch @@ -1,4 +1,4 @@ -From 91c1d0698afc3c81905651232ca1d52ea92d9542 Mon Sep 17 00:00:00 2001 +From dc31413d2687e928dcc14326938563e4d704cfbc 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 a7e179626b63..fdcc0eedc49f 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.0 +2.31.1 -From eb288ff77b396a6833237a950f40e41dd40fe011 Mon Sep 17 00:00:00 2001 +From 6e3bc9ee9be071ab778f90e546327fead9648121 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.0 +2.31.1 -From f39f0f0c81d66f27fcbee988266e84300c9a5ab6 Mon Sep 17 00:00:00 2001 +From 37ad1ea8065d241a721588c714833187b6196bfd 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.0 +2.31.1 diff --git a/patches/5.11/0004-surface-sam-over-hid.patch b/patches/5.11/0004-surface-sam-over-hid.patch index de9667ff2..034ce71b5 100644 --- a/patches/5.11/0004-surface-sam-over-hid.patch +++ b/patches/5.11/0004-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From 02fcd1ef94143c2ad0cb7b76fcee1dc7daa8a6d7 Mon Sep 17 00:00:00 2001 +From 571d6e0d037803bfcd93ce9b975d6f279f2aafe2 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.0 +2.31.1 -From 09075d4c0946438018a185b86eac9dce15b29827 Mon Sep 17 00:00:00 2001 +From 7a0dc685d9b52f95a8cdd42ab4a5a58d1a35eb23 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 @@ -330,5 +330,5 @@ index 000000000000..8b816ed8f35c +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 diff --git a/patches/5.11/0005-surface-sam.patch b/patches/5.11/0005-surface-sam.patch index 9bd63e61b..dd78d8dbd 100644 --- a/patches/5.11/0005-surface-sam.patch +++ b/patches/5.11/0005-surface-sam.patch @@ -1,4 +1,4 @@ -From 0c700275d9f211fd8a11f7d6614e2f520638ba1f Mon Sep 17 00:00:00 2001 +From 3335fd91af5d8c7a82242a73087fe5d61e7d781b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:51 +0100 Subject: [PATCH] platform/surface: Add Surface Aggregator subsystem @@ -9158,9 +9158,9 @@ index 000000000000..64276fbfa1d5 + +#endif /* _LINUX_SURFACE_AGGREGATOR_SERIAL_HUB_H */ -- -2.31.0 +2.31.1 -From 8371b5f32f7ec7a9fedb20d1a7c8e18429e13633 Mon Sep 17 00:00:00 2001 +From a0e2ee0347197fbc2a4300a4512b0f51551c58f1 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:52 +0100 Subject: [PATCH] platform/surface: aggregator: Add control packet allocation @@ -9320,9 +9320,9 @@ index 058f111292ca..e8757d03f279 100644 + #endif /* _SURFACE_AGGREGATOR_SSH_PACKET_LAYER_H */ -- -2.31.0 +2.31.1 -From dda656831cf11f505423f8edd5dd527f0606377c Mon Sep 17 00:00:00 2001 +From c22cbdc70795d77363f60bf582b15c44c12d22f8 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:53 +0100 Subject: [PATCH] platform/surface: aggregator: Add event item allocation @@ -9548,9 +9548,9 @@ index 60d312f71436..37593234fb31 100644 } module_exit(ssam_core_exit); -- -2.31.0 +2.31.1 -From 7375917efd1285a1f7345d3a1e61374890f139a4 Mon Sep 17 00:00:00 2001 +From d497b0e724f5ff728a314186a15cd08de5de1a12 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:54 +0100 Subject: [PATCH] platform/surface: aggregator: Add trace points @@ -10442,9 +10442,9 @@ index 000000000000..dcca8007d876 + +#include -- -2.31.0 +2.31.1 -From 65bd02ca093d1733cb54549a9751638451b52384 Mon Sep 17 00:00:00 2001 +From 8a666508023d27e83882531e9b76104c94c268d0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:55 +0100 Subject: [PATCH] platform/surface: aggregator: Add error injection @@ -10951,9 +10951,9 @@ index dcca8007d876..eb332bb53ae4 100644 DEFINE_SSAM_FREE_EVENT(ctrl_packet_free); -- -2.31.0 +2.31.1 -From b13806dafeff14be6cdaad9736d7c9327fe822ac Mon Sep 17 00:00:00 2001 +From 2555359381082e78a3ce2b1723d3c03d5dd48dae Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:56 +0100 Subject: [PATCH] platform/surface: aggregator: Add dedicated bus and device @@ -12050,9 +12050,9 @@ index fb4827027536..d21d2871387b 100644 /* Create MODULE_ALIAS() statements. -- -2.31.0 +2.31.1 -From e17f8d603291fa603359d2ad132ea776dcfc1bfb Mon Sep 17 00:00:00 2001 +From 9a7d6fecb7cf95b7ea5dce2efc4650ba2a671d58 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:57 +0100 Subject: [PATCH] docs: driver-api: Add Surface Aggregator subsystem @@ -13689,9 +13689,9 @@ index 530792c869c4..8e6fe82c1072 100644 F: include/linux/surface_aggregator/ -- -2.31.0 +2.31.1 -From 461efa8828105b740589ec8673adfe78a403945c Mon Sep 17 00:00:00 2001 +From 1010cfdf997e375bc6e29f7639f53781ea45190b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:58 +0100 Subject: [PATCH] platform/surface: Add Surface Aggregator user-space interface @@ -14301,9 +14301,9 @@ index 000000000000..fbcce04abfe9 + +#endif /* _UAPI_LINUX_SURFACE_AGGREGATOR_CDEV_H */ -- -2.31.0 +2.31.1 -From 3a1ade8f72b937629858465ebc82c0e4673bb751 Mon Sep 17 00:00:00 2001 +From 906ed42ce6f0e409ec04c5cc3a16fde08a0d1bd7 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 21 Dec 2020 19:39:59 +0100 Subject: [PATCH] platform/surface: Add Surface ACPI Notify driver @@ -15416,9 +15416,9 @@ index 000000000000..8e3e86c7d78c + +#endif /* _LINUX_SURFACE_ACPI_NOTIFY_H */ -- -2.31.0 +2.31.1 -From f4a7514d778da6ff5180ac88e58c53d7573b8ae2 Mon Sep 17 00:00:00 2001 +From 12e2ec8229cd33a0923af7faf5a5b385a0245589 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Mon, 11 Jan 2021 14:46:48 +0000 Subject: [PATCH] platform/surface: fix potential integer overflow on shift of @@ -15454,9 +15454,9 @@ index 8cd67a669c86..ef9c1f8e8336 100644 dev_dbg(dev, "notify event %#04llx\n", func); -- -2.31.0 +2.31.1 -From f459f702ea23d66f9e550b3db3435d27a0491a0e Mon Sep 17 00:00:00 2001 +From 414f44498f08d5a21031aab12a29f826e84e42a0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 11 Jan 2021 16:48:50 +0100 Subject: [PATCH] platform/surface: aggregator_cdev: Fix access of @@ -15494,9 +15494,9 @@ index 340d15b148b9..979340cdd9de 100644 void __user *rspdata; int status = 0, ret = 0, tmp; -- -2.31.0 +2.31.1 -From 3580c235191512dfffa9b9cdc2ded467c33fe4ce Mon Sep 17 00:00:00 2001 +From e764acbdf4edd10d4a3b8a2f853055194ec74a8c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 11 Jan 2021 16:48:51 +0100 Subject: [PATCH] platform/surface: aggregator_cdev: Add comments regarding @@ -15563,9 +15563,9 @@ index 979340cdd9de..79e28fab7e40 100644 if (!rsp.pointer) { ret = -ENOMEM; -- -2.31.0 +2.31.1 -From 08feed5fe75ced960fb3db8193f1fde8597b2d11 Mon Sep 17 00:00:00 2001 +From 4e2e9cc593afe650bda9d52712d8947360d696c2 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 14 Jan 2021 09:04:52 +0100 Subject: [PATCH] platform/surface: aggregator: fix a kernel-doc markup @@ -15598,9 +15598,9 @@ index bb1c862411a2..25db4d638cfa 100644 * * Return: Returns zero on success, a negative error code on failure. -- -2.31.0 +2.31.1 -From 58ae3b353f5cf89469766b3f2e2bdc461f145b2c Mon Sep 17 00:00:00 2001 +From f07609555f2e9bba184b21ca26d75b4230d6ef40 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 14 Jan 2021 16:08:26 +0100 Subject: [PATCH] platform/surface: aggregator: Fix kernel-doc references @@ -15635,9 +15635,9 @@ index 25db4d638cfa..52a83a8fcf82 100644 * Return: Returns zero on success and a nonzero error code on failure. */ -- -2.31.0 +2.31.1 -From 975e2951520f6cda4c23bbb4a0f4ab81c9a7304b Mon Sep 17 00:00:00 2001 +From 054300b2d132918aad395b75f4d53ab28733ad73 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 26 Jan 2021 18:22:02 +0100 Subject: [PATCH] platform/surface: aggregator: Fix braces in if condition with @@ -15698,9 +15698,9 @@ index 74f0faaa2b27..583315db8b02 100644 /* -- -2.31.0 +2.31.1 -From c34c49f35d59cbe74005ec7a1b4fda147272f2ba Mon Sep 17 00:00:00 2001 +From 09dd7f0b2c0b02bf3328ec178474825734abae54 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 11 Feb 2021 13:41:49 +0100 Subject: [PATCH] platform/surface: aggregator: Fix access of unaligned value @@ -15738,9 +15738,9 @@ index 583315db8b02..15d96eac6811 100644 static int ssh_ptl_rx_threadfn(void *data) -- -2.31.0 +2.31.1 -From 99804626530d972c92ed6670e9f46c901251dba4 Mon Sep 17 00:00:00 2001 +From 6c3cc4f59affb572bb219f000a4441a95658ee05 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 7 Feb 2021 03:42:45 +0100 Subject: [PATCH] platform/surface: Set up Surface Aggregator device registry @@ -16133,9 +16133,9 @@ index 000000000000..a051d941ad96 +MODULE_DESCRIPTION("Device-registry for Surface System Aggregator Module"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 -From a72e5aa8093f8325e96e1d997de0b18f09d62746 Mon Sep 17 00:00:00 2001 +From 3585a52d7065d098bc37d128be36918cc270d993 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 7 Feb 2021 04:14:35 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add base device hub @@ -16459,9 +16459,9 @@ index a051d941ad96..6c23d75a044c 100644 MODULE_AUTHOR("Maximilian Luz "); MODULE_DESCRIPTION("Device-registry for Surface System Aggregator Module"); -- -2.31.0 +2.31.1 -From afd3b258a6bdb96e0642babad9707383ae6da152 Mon Sep 17 00:00:00 2001 +From 9bf55acd6271944166ff8ce9b4029a9810a482ad Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 7 Feb 2021 04:55:09 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add battery subsystem @@ -16545,9 +16545,9 @@ index 6c23d75a044c..cde279692842 100644 }; -- -2.31.0 +2.31.1 -From 0cb17981f08cc3083bc2f84da48f49825f91fb6e Mon Sep 17 00:00:00 2001 +From 6b496519b5f02e859c5757fcc7b12983e9469228 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 7 Feb 2021 05:01:08 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add platform profile @@ -16644,9 +16644,9 @@ index cde279692842..33904613dd4b 100644 }; -- -2.31.0 +2.31.1 -From c64ca95fc3915aa38881099919d2ef4b65b85ca9 Mon Sep 17 00:00:00 2001 +From 10949812647b4d498c5c420f6f55473e59cc2bf0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 7 Feb 2021 05:06:41 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add DTX device @@ -16685,9 +16685,9 @@ index 33904613dd4b..dc044d06828b 100644 }; -- -2.31.0 +2.31.1 -From a706c777f1d1632e5c393c8e51aa0f8e3da4c757 Mon Sep 17 00:00:00 2001 +From 1de50313503c6af108ad2a2a37ebdf853e8d498e Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 7 Feb 2021 05:16:44 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add HID subsystem @@ -16778,9 +16778,9 @@ index dc044d06828b..caee90d135c5 100644 }; -- -2.31.0 +2.31.1 -From 8558e1b824cd947857bc04c9a2c96bc3ef2a4475 Mon Sep 17 00:00:00 2001 +From 9d789e96040427d71a51182f90efed2d5bd84856 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 9 Mar 2021 17:03:15 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -16819,9 +16819,9 @@ index caee90d135c5..6de74e893d06 100644 { "MSHW0107", (unsigned long)ssam_node_group_sb2 }, -- -2.31.0 +2.31.1 -From 5b6680505958324b1511d5845c51fb880686c2a4 Mon Sep 17 00:00:00 2001 +From 2737002b734ec8a1d4b0747ec6a46b577850c4da Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 9 Mar 2021 13:15:00 +0000 Subject: [PATCH] platform/surface: aggregator_registry: Make symbol @@ -16860,9 +16860,250 @@ index 6de74e893d06..304d601980ed 100644 }; -- -2.31.0 +2.31.1 -From 329f536e5fe11a7a1c883bad0da1338f7d030c8b Mon Sep 17 00:00:00 2001 +From 657917eb11da270b53cf35ba645c1ed8cd969e23 Mon Sep 17 00:00:00 2001 +From: Maximilian Luz +Date: Wed, 7 Apr 2021 01:51:47 +0200 +Subject: [PATCH] platform/surface: aggregator_registry: Give devices time to + set up when connecting + +Sometimes, the "base connected" event that we rely on to (re-)attach the +device connected to the base is sent a bit too early. When this happens, +some devices may not be completely ready yet. + +Specifically, the battery has been observed to report zero-values for +things like full charge capacity, which, however, is only loaded once +when the driver for that device probes. This can thus result in battery +readings being unavailable. + +As we cannot easily and reliably discern between devices that are not +ready yet and devices that are not connected (i.e. will never be ready), +delay adding these devices. This should give them enough time to set up. + +The delay is set to 2.5 seconds, which should give us a good safety +margin based on testing and still be fairly responsive for users. + +To achieve that delay switch to updating via a delayed work struct, +which means that we can also get rid of some locking. + +Signed-off-by: Maximilian Luz +Patchset: surface-sam +--- + .../surface/surface_aggregator_registry.c | 98 ++++++++----------- + 1 file changed, 40 insertions(+), 58 deletions(-) + +diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c +index 304d601980ed..dd1d6504b004 100644 +--- a/drivers/platform/surface/surface_aggregator_registry.c ++++ b/drivers/platform/surface/surface_aggregator_registry.c +@@ -13,10 +13,10 @@ + #include + #include + #include +-#include + #include + #include + #include ++#include + + #include + #include +@@ -287,6 +287,13 @@ static int ssam_hub_add_devices(struct device *parent, struct ssam_controller *c + + /* -- SSAM base-hub driver. ------------------------------------------------- */ + ++/* ++ * Some devices (especially battery) may need a bit of time to be fully usable ++ * after being (re-)connected. This delay has been determined via ++ * experimentation. ++ */ ++#define SSAM_BASE_UPDATE_CONNECT_DELAY msecs_to_jiffies(2500) ++ + enum ssam_base_hub_state { + SSAM_BASE_HUB_UNINITIALIZED, + SSAM_BASE_HUB_CONNECTED, +@@ -296,8 +303,8 @@ enum ssam_base_hub_state { + struct ssam_base_hub { + struct ssam_device *sdev; + +- struct mutex lock; /* Guards state update checks and transitions. */ + enum ssam_base_hub_state state; ++ struct delayed_work update_work; + + struct ssam_event_notifier notif; + }; +@@ -335,11 +342,7 @@ static ssize_t ssam_base_hub_state_show(struct device *dev, struct device_attrib + char *buf) + { + struct ssam_base_hub *hub = dev_get_drvdata(dev); +- bool connected; +- +- mutex_lock(&hub->lock); +- connected = hub->state == SSAM_BASE_HUB_CONNECTED; +- mutex_unlock(&hub->lock); ++ bool connected = hub->state == SSAM_BASE_HUB_CONNECTED; + + return sysfs_emit(buf, "%d\n", connected); + } +@@ -356,16 +359,20 @@ static const struct attribute_group ssam_base_hub_group = { + .attrs = ssam_base_hub_attrs, + }; + +-static int __ssam_base_hub_update(struct ssam_base_hub *hub, enum ssam_base_hub_state new) ++static void ssam_base_hub_update_workfn(struct work_struct *work) + { ++ struct ssam_base_hub *hub = container_of(work, struct ssam_base_hub, update_work.work); + struct fwnode_handle *node = dev_fwnode(&hub->sdev->dev); ++ enum ssam_base_hub_state state; + int status = 0; + +- lockdep_assert_held(&hub->lock); ++ status = ssam_base_hub_query_state(hub, &state); ++ if (status) ++ return; + +- if (hub->state == new) +- return 0; +- hub->state = new; ++ if (hub->state == state) ++ return; ++ hub->state = state; + + if (hub->state == SSAM_BASE_HUB_CONNECTED) + status = ssam_hub_add_devices(&hub->sdev->dev, hub->sdev->ctrl, node); +@@ -374,51 +381,28 @@ static int __ssam_base_hub_update(struct ssam_base_hub *hub, enum ssam_base_hub_ + + if (status) + dev_err(&hub->sdev->dev, "failed to update base-hub devices: %d\n", status); +- +- return status; +-} +- +-static int ssam_base_hub_update(struct ssam_base_hub *hub) +-{ +- enum ssam_base_hub_state state; +- int status; +- +- mutex_lock(&hub->lock); +- +- status = ssam_base_hub_query_state(hub, &state); +- if (!status) +- status = __ssam_base_hub_update(hub, state); +- +- mutex_unlock(&hub->lock); +- return status; + } + + static u32 ssam_base_hub_notif(struct ssam_event_notifier *nf, const struct ssam_event *event) + { +- struct ssam_base_hub *hub; +- struct ssam_device *sdev; +- enum ssam_base_hub_state new; +- +- hub = container_of(nf, struct ssam_base_hub, notif); +- sdev = hub->sdev; ++ struct ssam_base_hub *hub = container_of(nf, struct ssam_base_hub, notif); ++ unsigned long delay; + + if (event->command_id != SSAM_EVENT_BAS_CID_CONNECTION) + return 0; + + if (event->length < 1) { +- dev_err(&sdev->dev, "unexpected payload size: %u\n", +- event->length); ++ dev_err(&hub->sdev->dev, "unexpected payload size: %u\n", event->length); + return 0; + } + +- if (event->data[0]) +- new = SSAM_BASE_HUB_CONNECTED; +- else +- new = SSAM_BASE_HUB_DISCONNECTED; ++ /* ++ * Delay update when the base is being connected to give devices/EC ++ * some time to set up. ++ */ ++ delay = event->data[0] ? SSAM_BASE_UPDATE_CONNECT_DELAY : 0; + +- mutex_lock(&hub->lock); +- __ssam_base_hub_update(hub, new); +- mutex_unlock(&hub->lock); ++ schedule_delayed_work(&hub->update_work, delay); + + /* + * Do not return SSAM_NOTIF_HANDLED: The event should be picked up and +@@ -430,7 +414,10 @@ static u32 ssam_base_hub_notif(struct ssam_event_notifier *nf, const struct ssam + + static int __maybe_unused ssam_base_hub_resume(struct device *dev) + { +- return ssam_base_hub_update(dev_get_drvdata(dev)); ++ struct ssam_base_hub *hub = dev_get_drvdata(dev); ++ ++ schedule_delayed_work(&hub->update_work, 0); ++ return 0; + } + static SIMPLE_DEV_PM_OPS(ssam_base_hub_pm_ops, NULL, ssam_base_hub_resume); + +@@ -443,8 +430,6 @@ static int ssam_base_hub_probe(struct ssam_device *sdev) + if (!hub) + return -ENOMEM; + +- mutex_init(&hub->lock); +- + hub->sdev = sdev; + hub->state = SSAM_BASE_HUB_UNINITIALIZED; + +@@ -456,27 +441,25 @@ static int ssam_base_hub_probe(struct ssam_device *sdev) + hub->notif.event.mask = SSAM_EVENT_MASK_NONE; + hub->notif.event.flags = SSAM_EVENT_SEQUENCED; + ++ INIT_DELAYED_WORK(&hub->update_work, ssam_base_hub_update_workfn); ++ + ssam_device_set_drvdata(sdev, hub); + + status = ssam_notifier_register(sdev->ctrl, &hub->notif); + if (status) +- goto err_register; +- +- status = ssam_base_hub_update(hub); +- if (status) +- goto err_update; ++ return status; + + status = sysfs_create_group(&sdev->dev.kobj, &ssam_base_hub_group); + if (status) +- goto err_update; ++ goto err; + ++ schedule_delayed_work(&hub->update_work, 0); + return 0; + +-err_update: ++err: + ssam_notifier_unregister(sdev->ctrl, &hub->notif); ++ cancel_delayed_work_sync(&hub->update_work); + ssam_hub_remove_devices(&sdev->dev); +-err_register: +- mutex_destroy(&hub->lock); + return status; + } + +@@ -487,9 +470,8 @@ static void ssam_base_hub_remove(struct ssam_device *sdev) + sysfs_remove_group(&sdev->dev.kobj, &ssam_base_hub_group); + + ssam_notifier_unregister(sdev->ctrl, &hub->notif); ++ cancel_delayed_work_sync(&hub->update_work); + ssam_hub_remove_devices(&sdev->dev); +- +- mutex_destroy(&hub->lock); + } + + static const struct ssam_device_id ssam_base_hub_match[] = { +-- +2.31.1 + +From ec31a6fd1d720b8956223ec24208367b96473362 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 9 Feb 2021 02:46:40 +0100 Subject: [PATCH] platform/surface: Add DTX driver @@ -18351,9 +18592,9 @@ index 000000000000..0833aab0d819 + +#endif /* _UAPI_LINUX_SURFACE_AGGREGATOR_DTX_H */ -- -2.31.0 +2.31.1 -From fe26e240690665522af694f5a5a7a2985d0f236a Mon Sep 17 00:00:00 2001 +From 0b8ed51b1bbbebb11b3384facd987a4cffe7af16 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 9 Feb 2021 02:50:11 +0100 Subject: [PATCH] platform/surface: dtx: Add support for native SSAM devices @@ -18492,9 +18733,49 @@ index a95adc1094aa..4bb5d286bf95 100644 MODULE_AUTHOR("Maximilian Luz "); MODULE_DESCRIPTION("Detachment-system driver for Surface System Aggregator Module"); -- -2.31.0 +2.31.1 -From 5371ba2eedca09094db9dcf6b2b8c60159663543 Mon Sep 17 00:00:00 2001 +From fee7d074f6d0e456be6c18432fb07aa5a73758b8 Mon Sep 17 00:00:00 2001 +From: kernel test robot +Date: Wed, 7 Apr 2021 01:51:07 +0200 +Subject: [PATCH] platform/surface: fix semicolon.cocci warnings + +drivers/platform/surface/surface_dtx.c:651:2-3: Unneeded semicolon + + Remove unneeded semicolon. + +Generated by: scripts/coccinelle/misc/semicolon.cocci + +Fixes: 1d609992832e ("platform/surface: Add DTX driver") +CC: Maximilian Luz +Reported-by: kernel test robot +Signed-off-by: kernel test robot +Reviewed-by: Maximilian Luz +Link: https://lore.kernel.org/r/20210319051919.GA39801@ae4f36e4f012 +Signed-off-by: Hans de Goede +Upstream: e4899ff6a9120ca5dfa82035d51d4d118260be6e +Patchset: surface-sam +--- + drivers/platform/surface/surface_dtx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c +index 4bb5d286bf95..2591b875b016 100644 +--- a/drivers/platform/surface/surface_dtx.c ++++ b/drivers/platform/surface/surface_dtx.c +@@ -649,7 +649,7 @@ static u32 sdtx_notifier(struct ssam_event_notifier *nf, const struct ssam_event + + default: + return 0; +- }; ++ } + + if (in->length != len) { + dev_err(ddev->dev, +-- +2.31.1 + +From 6b04a78c46e49f4026c1c1230309a0889d075b66 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 9 Feb 2021 02:55:31 +0100 Subject: [PATCH] docs: driver-api: Add Surface DTX driver documentation @@ -19260,38 +19541,9 @@ index 1a60e353df38..a6a4f5afdfa8 100644 F: include/uapi/linux/surface_aggregator/dtx.h -- -2.31.0 +2.31.1 -From a6c935de36064d4dd03c11201ac1cf1013d26416 Mon Sep 17 00:00:00 2001 -From: Maximilian Luz -Date: Thu, 11 Feb 2021 20:02:57 +0100 -Subject: [PATCH] input: Add bus ID for Surface Aggregator Module - -Add a bus identifier for the Surface System Aggregator Module, which -connects various integrated HID devices on Microsoft Surface models via -a dedicated HID transport protocol. - -Patchset: surface-sam ---- - include/uapi/linux/input.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h -index 9a61c28ed3ae..3e81ea3d7df2 100644 ---- a/include/uapi/linux/input.h -+++ b/include/uapi/linux/input.h -@@ -271,6 +271,7 @@ struct input_mask { - #define BUS_RMI 0x1D - #define BUS_CEC 0x1E - #define BUS_INTEL_ISHTP 0x1F -+#define BUS_SURFACE_AGGREGATOR 0x20 - - /* - * MT_TOOL types --- -2.31.0 - -From 67807eaaf15f2f6b96052861c98c8ba1d77a181d Mon Sep 17 00:00:00 2001 +From 25afdfc0f8a84bfb3977e004d0c49f22ed32664f Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 11 Feb 2021 20:08:50 +0100 Subject: [PATCH] HID: Add support for Surface Aggregator Module HID transport @@ -19672,7 +19924,7 @@ index 000000000000..e4477c328536 +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/surface-hid/surface_hid_core.c b/drivers/hid/surface-hid/surface_hid_core.c new file mode 100644 -index 000000000000..2cadb8013529 +index 000000000000..7b27ec392232 --- /dev/null +++ b/drivers/hid/surface-hid/surface_hid_core.c @@ -0,0 +1,272 @@ @@ -19845,7 +20097,7 @@ index 000000000000..2cadb8013529 + return PTR_ERR(shid->hid); + + shid->hid->dev.parent = shid->dev; -+ shid->hid->bus = BUS_SURFACE_AGGREGATOR; ++ shid->hid->bus = BUS_HOST; + shid->hid->vendor = cpu_to_le16(shid->attrs.vendor); + shid->hid->product = cpu_to_le16(shid->attrs.product); + shid->hid->version = cpu_to_le16(shid->hid_desc.hid_version); @@ -20032,9 +20284,9 @@ index 000000000000..4b1a7b57e035 + +#endif /* SURFACE_HID_CORE_H */ -- -2.31.0 +2.31.1 -From 793ac74222c86e9e445aab0eded525edd6b75282 Mon Sep 17 00:00:00 2001 +From f2111da9c918c9ef8a877052a1dc527ce1b90857 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 11 Feb 2021 20:10:17 +0100 Subject: [PATCH] HID: surface-hid: Add support for legacy keyboard interface @@ -20424,9 +20676,9 @@ index 000000000000..0635341bc517 +MODULE_DESCRIPTION("HID legacy transport driver for Surface System Aggregator Module"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 -From eed7178fa7ca26b93d87546094922b5749763b2d Mon Sep 17 00:00:00 2001 +From ccb693a47e6765426166f300c065b106742862a4 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 21:06:12 +0100 Subject: [PATCH] power: supply: Add battery driver for Surface Aggregator @@ -20453,8 +20705,8 @@ Patchset: surface-sam MAINTAINERS | 7 + drivers/power/supply/Kconfig | 16 + drivers/power/supply/Makefile | 1 + - drivers/power/supply/surface_battery.c | 901 +++++++++++++++++++++++++ - 4 files changed, 925 insertions(+) + drivers/power/supply/surface_battery.c | 865 +++++++++++++++++++++++++ + 4 files changed, 889 insertions(+) create mode 100644 drivers/power/supply/surface_battery.c diff --git a/MAINTAINERS b/MAINTAINERS @@ -20511,10 +20763,10 @@ index dd4b86318cd9..cddc18994119 100644 +obj-$(CONFIG_BATTERY_SURFACE) += surface_battery.o diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c new file mode 100644 -index 000000000000..327fd7af386b +index 000000000000..1f114f3f3f59 --- /dev/null +++ b/drivers/power/supply/surface_battery.c -@@ -0,0 +1,901 @@ +@@ -0,0 +1,865 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Battery driver for 7th-generation Microsoft Surface devices via Surface @@ -20664,7 +20916,7 @@ index 000000000000..327fd7af386b +/* -- State management. ----------------------------------------------------- */ + +/* -+ * Delay for battery update quirk. See spwr_battery_recheck_adapter() below ++ * Delay for battery update quirk. See spwr_external_power_changed() below + * for more details. + */ +#define SPWR_AC_BAT_UPDATE_DELAY msecs_to_jiffies(5000) @@ -20857,21 +21109,6 @@ index 000000000000..327fd7af386b + return status; +} + -+static int spwr_battery_recheck_adapter(struct spwr_battery_device *bat) -+{ -+ /* -+ * Handle battery update quirk: When the battery is fully charged (or -+ * charged up to the limit imposed by the UEFI battery limit) and the -+ * adapter is plugged in or removed, the EC does not send a separate -+ * event for the state (charging/discharging) change. Furthermore it -+ * may take some time until the state is updated on the battery. -+ * Schedule an update to solve this. -+ */ -+ -+ schedule_delayed_work(&bat->update_work, SPWR_AC_BAT_UPDATE_DELAY); -+ return 0; -+} -+ +static u32 spwr_notify_bat(struct ssam_event_notifier *nf, const struct ssam_event *event) +{ + struct spwr_battery_device *bat = container_of(nf, struct spwr_battery_device, notif); @@ -20880,18 +21117,6 @@ index 000000000000..327fd7af386b + dev_dbg(&bat->sdev->dev, "power event (cid = %#04x, iid = %#04x, tid = %#04x)\n", + event->command_id, event->instance_id, event->target_id); + -+ /* Handled here, needs to be handled for all targets/instances. */ -+ if (event->command_id == SAM_EVENT_CID_BAT_ADP) { -+ status = spwr_battery_recheck_adapter(bat); -+ return ssam_notifier_from_errno(status) | SSAM_NOTIF_HANDLED; -+ } -+ -+ if (bat->sdev->uid.target != event->target_id) -+ return 0; -+ -+ if (bat->sdev->uid.instance != event->instance_id) -+ return 0; -+ + switch (event->command_id) { + case SAM_EVENT_CID_BAT_BIX: + status = spwr_battery_recheck_full(bat); @@ -20932,17 +21157,34 @@ index 000000000000..327fd7af386b + bat = container_of(dwork, struct spwr_battery_device, update_work); + + status = spwr_battery_update_bst(bat, false); -+ if (!status) -+ power_supply_changed(bat->psy); -+ -+ if (status) ++ if (status) { + dev_err(&bat->sdev->dev, "failed to update battery state: %d\n", status); ++ return; ++ } ++ ++ power_supply_changed(bat->psy); ++} ++ ++static void spwr_external_power_changed(struct power_supply *psy) ++{ ++ struct spwr_battery_device *bat = power_supply_get_drvdata(psy); ++ ++ /* ++ * Handle battery update quirk: When the battery is fully charged (or ++ * charged up to the limit imposed by the UEFI battery limit) and the ++ * adapter is plugged in or removed, the EC does not send a separate ++ * event for the state (charging/discharging) change. Furthermore it ++ * may take some time until the state is updated on the battery. ++ * Schedule an update to solve this. ++ */ ++ ++ schedule_delayed_work(&bat->update_work, SPWR_AC_BAT_UPDATE_DELAY); +} + + +/* -- Properties. ----------------------------------------------------------- */ + -+static enum power_supply_property spwr_battery_props_chg[] = { ++static const enum power_supply_property spwr_battery_props_chg[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_TECHNOLOGY, @@ -20960,7 +21202,7 @@ index 000000000000..327fd7af386b + POWER_SUPPLY_PROP_SERIAL_NUMBER, +}; + -+static enum power_supply_property spwr_battery_props_eng[] = { ++static const enum power_supply_property spwr_battery_props_eng[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_TECHNOLOGY, @@ -21030,10 +21272,10 @@ index 000000000000..327fd7af386b + lockdep_assert_held(&bat->lock); + + if (full_cap == 0 || full_cap == SPWR_BATTERY_VALUE_UNKNOWN) -+ return -ENODEV; ++ return -ENODATA; + + if (remaining_cap == SPWR_BATTERY_VALUE_UNKNOWN) -+ return -ENODEV; ++ return -ENODATA; + + return remaining_cap * 100 / full_cap; +} @@ -21094,7 +21336,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: @@ -21102,7 +21344,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value * 1000; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_VOLTAGE_NOW: @@ -21110,7 +21352,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value * 1000; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_CURRENT_NOW: @@ -21119,7 +21361,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value * 1000; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: @@ -21128,7 +21370,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value * 1000; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_CHARGE_FULL: @@ -21137,7 +21379,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value * 1000; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_CHARGE_NOW: @@ -21146,7 +21388,7 @@ index 000000000000..327fd7af386b + if (value != SPWR_BATTERY_VALUE_UNKNOWN) + val->intval = value * 1000; + else -+ status = -ENODEV; ++ status = -ENODATA; + break; + + case POWER_SUPPLY_PROP_CAPACITY: @@ -21182,7 +21424,7 @@ index 000000000000..327fd7af386b + +/* -- Alarm attribute. ------------------------------------------------------ */ + -+static ssize_t spwr_battery_alarm_show(struct device *dev, struct device_attribute *attr, char *buf) ++static ssize_t alarm_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct power_supply *psy = dev_get_drvdata(dev); + struct spwr_battery_device *bat = power_supply_get_drvdata(psy); @@ -21195,8 +21437,8 @@ index 000000000000..327fd7af386b + return status; +} + -+static ssize_t spwr_battery_alarm_store(struct device *dev, struct device_attribute *attr, -+ const char *buf, size_t count) ++static ssize_t alarm_store(struct device *dev, struct device_attribute *attr, const char *buf, ++ size_t count) +{ + struct power_supply *psy = dev_get_drvdata(dev); + struct spwr_battery_device *bat = power_supply_get_drvdata(psy); @@ -21224,11 +21466,13 @@ index 000000000000..327fd7af386b + return count; +} + -+static const struct device_attribute alarm_attr = { -+ .attr = {.name = "alarm", .mode = 0644}, -+ .show = spwr_battery_alarm_show, -+ .store = spwr_battery_alarm_store, ++DEVICE_ATTR_RW(alarm); ++ ++static struct attribute *spwr_battery_attrs[] = { ++ &dev_attr_alarm.attr, ++ NULL, +}; ++ATTRIBUTE_GROUPS(spwr_battery); + + +/* -- Device setup. --------------------------------------------------------- */ @@ -21246,7 +21490,7 @@ index 000000000000..327fd7af386b + bat->notif.event.reg = registry; + bat->notif.event.id.target_category = sdev->uid.category; + bat->notif.event.id.instance = 0; -+ bat->notif.event.mask = SSAM_EVENT_MASK_NONE; ++ bat->notif.event.mask = SSAM_EVENT_MASK_STRICT; + bat->notif.event.flags = SSAM_EVENT_SEQUENCED; + + bat->psy_desc.name = bat->name; @@ -21256,11 +21500,6 @@ index 000000000000..327fd7af386b + INIT_DELAYED_WORK(&bat->update_work, spwr_battery_update_bst_workfn); +} + -+static void spwr_battery_destroy(struct spwr_battery_device *bat) -+{ -+ mutex_destroy(&bat->lock); -+} -+ +static int spwr_battery_register(struct spwr_battery_device *bat) +{ + struct power_supply_config psy_cfg = {}; @@ -21296,6 +21535,8 @@ index 000000000000..327fd7af386b + + mutex_unlock(&bat->lock); + ++ bat->psy_desc.external_power_changed = spwr_external_power_changed; ++ + switch (get_unaligned_le32(&bat->bix.power_unit)) { + case SAM_BATTERY_POWER_UNIT_mW: + bat->psy_desc.properties = spwr_battery_props_eng; @@ -21314,33 +21555,13 @@ index 000000000000..327fd7af386b + } + + psy_cfg.drv_data = bat; -+ bat->psy = power_supply_register(&bat->sdev->dev, &bat->psy_desc, &psy_cfg); ++ psy_cfg.attr_grp = spwr_battery_groups; ++ ++ bat->psy = devm_power_supply_register(&bat->sdev->dev, &bat->psy_desc, &psy_cfg); + if (IS_ERR(bat->psy)) + return PTR_ERR(bat->psy); + -+ status = ssam_notifier_register(bat->sdev->ctrl, &bat->notif); -+ if (status) -+ goto err_notif; -+ -+ status = device_create_file(&bat->psy->dev, &alarm_attr); -+ if (status) -+ goto err_file; -+ -+ return 0; -+ -+err_file: -+ ssam_notifier_unregister(bat->sdev->ctrl, &bat->notif); -+err_notif: -+ power_supply_unregister(bat->psy); -+ return status; -+} -+ -+static void spwr_battery_unregister(struct spwr_battery_device *bat) -+{ -+ ssam_notifier_unregister(bat->sdev->ctrl, &bat->notif); -+ cancel_delayed_work_sync(&bat->update_work); -+ device_remove_file(&bat->psy->dev, &alarm_attr); -+ power_supply_unregister(bat->psy); ++ return ssam_notifier_register(bat->sdev->ctrl, &bat->notif); +} + + @@ -21356,7 +21577,6 @@ index 000000000000..327fd7af386b +{ + const struct spwr_psy_properties *p; + struct spwr_battery_device *bat; -+ int status; + + p = ssam_device_get_match_data(sdev); + if (!p) @@ -21369,19 +21589,15 @@ index 000000000000..327fd7af386b + spwr_battery_init(bat, sdev, p->registry, p->name); + ssam_device_set_drvdata(sdev, bat); + -+ status = spwr_battery_register(bat); -+ if (status) -+ spwr_battery_destroy(bat); -+ -+ return status; ++ return spwr_battery_register(bat); +} + +static void surface_battery_remove(struct ssam_device *sdev) +{ + struct spwr_battery_device *bat = ssam_device_get_drvdata(sdev); + -+ spwr_battery_unregister(bat); -+ spwr_battery_destroy(bat); ++ ssam_notifier_unregister(sdev->ctrl, &bat->notif); ++ cancel_delayed_work_sync(&bat->update_work); +} + +static const struct spwr_psy_properties spwr_psy_props_bat1 = { @@ -21417,9 +21633,9 @@ index 000000000000..327fd7af386b +MODULE_DESCRIPTION("Battery driver for Surface System Aggregator Module"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 -From ac720c108673ef509b68ff0c1bb47a818cf98ed2 Mon Sep 17 00:00:00 2001 +From a70418b8ca8764068cfc061cd0559bd594da8194 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 21:07:17 +0100 Subject: [PATCH] power: supply: Add AC driver for Surface Aggregator Module @@ -21444,8 +21660,8 @@ Patchset: surface-sam MAINTAINERS | 1 + drivers/power/supply/Kconfig | 16 ++ drivers/power/supply/Makefile | 1 + - drivers/power/supply/surface_charger.c | 296 +++++++++++++++++++++++++ - 4 files changed, 314 insertions(+) + drivers/power/supply/surface_charger.c | 282 +++++++++++++++++++++++++ + 4 files changed, 300 insertions(+) create mode 100644 drivers/power/supply/surface_charger.c diff --git a/MAINTAINERS b/MAINTAINERS @@ -21496,10 +21712,10 @@ index cddc18994119..9fdd34956153 100644 +obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c new file mode 100644 -index 000000000000..982f9b9ef6f5 +index 000000000000..e89ffab86e9c --- /dev/null +++ b/drivers/power/supply/surface_charger.c -@@ -0,0 +1,296 @@ +@@ -0,0 +1,282 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * AC driver for 7th-generation Microsoft Surface devices via Surface System @@ -21634,7 +21850,7 @@ index 000000000000..982f9b9ef6f5 + +/* -- Properties. ----------------------------------------------------------- */ + -+static enum power_supply_property spwr_ac_props[] = { ++static const enum power_supply_property spwr_ac_props[] = { + POWER_SUPPLY_PROP_ONLINE, +}; + @@ -21668,6 +21884,11 @@ index 000000000000..982f9b9ef6f5 + +/* -- Device setup. --------------------------------------------------------- */ + ++static char *battery_supplied_to[] = { ++ "BAT1", ++ "BAT2", ++}; ++ +static void spwr_ac_init(struct spwr_ac_device *ac, struct ssam_device *sdev, + struct ssam_event_registry registry, const char *name) +{ @@ -21691,11 +21912,6 @@ index 000000000000..982f9b9ef6f5 + ac->psy_desc.get_property = spwr_ac_get_property; +} + -+static void spwr_ac_destroy(struct spwr_ac_device *ac) -+{ -+ mutex_destroy(&ac->lock); -+} -+ +static int spwr_ac_register(struct spwr_ac_device *ac) +{ + struct power_supply_config psy_cfg = {}; @@ -21711,22 +21927,14 @@ index 000000000000..982f9b9ef6f5 + return -ENODEV; + + psy_cfg.drv_data = ac; -+ ac->psy = power_supply_register(&ac->sdev->dev, &ac->psy_desc, &psy_cfg); ++ psy_cfg.supplied_to = battery_supplied_to; ++ psy_cfg.num_supplicants = ARRAY_SIZE(battery_supplied_to); ++ ++ ac->psy = devm_power_supply_register(&ac->sdev->dev, &ac->psy_desc, &psy_cfg); + if (IS_ERR(ac->psy)) + return PTR_ERR(ac->psy); + -+ status = ssam_notifier_register(ac->sdev->ctrl, &ac->notif); -+ if (status) -+ power_supply_unregister(ac->psy); -+ -+ return status; -+} -+ -+static int spwr_ac_unregister(struct spwr_ac_device *ac) -+{ -+ ssam_notifier_unregister(ac->sdev->ctrl, &ac->notif); -+ power_supply_unregister(ac->psy); -+ return 0; ++ return ssam_notifier_register(ac->sdev->ctrl, &ac->notif); +} + + @@ -21742,7 +21950,6 @@ index 000000000000..982f9b9ef6f5 +{ + const struct spwr_psy_properties *p; + struct spwr_ac_device *ac; -+ int status; + + p = ssam_device_get_match_data(sdev); + if (!p) @@ -21755,19 +21962,14 @@ index 000000000000..982f9b9ef6f5 + spwr_ac_init(ac, sdev, p->registry, p->name); + ssam_device_set_drvdata(sdev, ac); + -+ status = spwr_ac_register(ac); -+ if (status) -+ spwr_ac_destroy(ac); -+ -+ return status; ++ return spwr_ac_register(ac); +} + +static void surface_ac_remove(struct ssam_device *sdev) +{ + struct spwr_ac_device *ac = ssam_device_get_drvdata(sdev); + -+ spwr_ac_unregister(ac); -+ spwr_ac_destroy(ac); ++ ssam_notifier_unregister(sdev->ctrl, &ac->notif); +} + +static const struct spwr_psy_properties spwr_psy_props_adp1 = { @@ -21797,9 +21999,9 @@ index 000000000000..982f9b9ef6f5 +MODULE_DESCRIPTION("AC driver for Surface System Aggregator Module"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 -From 8fc7d4f6d7efcf2a5b53bbd759affba0fa8f2f47 Mon Sep 17 00:00:00 2001 +From 306b9415f4bf4d863befe2a835af16c7cfdc931d Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 13 Feb 2021 19:58:50 +0100 Subject: [PATCH] platform/surface: Add performance mode driver @@ -21984,9 +22186,9 @@ index 000000000000..3b92a43f8606 +MODULE_DESCRIPTION("Performance mode interface for Surface System Aggregator Module"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 -From 784252e94930063aec12fbdd0f4e60f899fbfdbc Mon Sep 17 00:00:00 2001 +From 684b9e26395c115cda7c34ff23a080f7fe471ba8 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 4 Mar 2021 20:05:24 +0100 Subject: [PATCH] platform/surface: aggregator: Make SSAM_DEFINE_SYNC_REQUEST_x @@ -22109,10 +22311,10 @@ index 5bcb59ed579d..aa6f37b4f46e 100644 .target_id = 0x01, .command_id = 0x34, diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c -index 304d601980ed..eccb9d1007cd 100644 +index dd1d6504b004..685d37a7add1 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c -@@ -302,7 +302,7 @@ struct ssam_base_hub { +@@ -309,7 +309,7 @@ struct ssam_base_hub { struct ssam_event_notifier notif; }; @@ -22122,7 +22324,7 @@ index 304d601980ed..eccb9d1007cd 100644 .target_id = 0x01, .command_id = 0x0d, diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c -index 4bb5d286bf95..85451eb94d98 100644 +index 2591b875b016..1fedacf74050 100644 --- a/drivers/platform/surface/surface_dtx.c +++ b/drivers/platform/surface/surface_dtx.c @@ -69,63 +69,63 @@ struct ssam_bas_base_info { @@ -22218,7 +22420,7 @@ index 3b92a43f8606..a9114e001d0d 100644 .command_id = 0x03, }); diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c -index 327fd7af386b..b93a4f556b5c 100644 +index 1f114f3f3f59..4116dd839ecd 100644 --- a/drivers/power/supply/surface_battery.c +++ b/drivers/power/supply/surface_battery.c @@ -85,25 +85,25 @@ static_assert(sizeof(struct spwr_bst) == 16); @@ -22252,7 +22454,7 @@ index 327fd7af386b..b93a4f556b5c 100644 .command_id = 0x04, }); diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c -index 982f9b9ef6f5..fe484523a2c2 100644 +index e89ffab86e9c..c2dd7e604d14 100644 --- a/drivers/power/supply/surface_charger.c +++ b/drivers/power/supply/surface_charger.c @@ -28,13 +28,13 @@ enum sam_battery_sta { @@ -22497,5 +22699,5 @@ index 02f3e06c0a60..4441ad667c3f 100644 return __raw_##name(sdev->ctrl, sdev->uid.target, \ sdev->uid.instance, ret); \ -- -2.31.0 +2.31.1 diff --git a/patches/5.11/0006-surface-hotplug.patch b/patches/5.11/0006-surface-hotplug.patch index bc414ee5b..6f4749683 100644 --- a/patches/5.11/0006-surface-hotplug.patch +++ b/patches/5.11/0006-surface-hotplug.patch @@ -1,4 +1,4 @@ -From 2be07e22dfd6088e4fcd41e54093950ffbd9b008 Mon Sep 17 00:00:00 2001 +From 8b4aab08babfd361ec3c81577055489825cfa6a4 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 16 Mar 2021 16:51:40 +0100 Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags() @@ -64,9 +64,9 @@ index 9449dfde2841..5ddc27d9a275 100644 bridge = pci_upstream_bridge(dev); if (bridge) -- -2.31.0 +2.31.1 -From 2861be00b54ea7017f48e5bbd010cde74969e58b Mon Sep 17 00:00:00 2001 +From 00c11a3a37853fd15e51efa75f6f1eaf22dc8dd2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 5 Feb 2021 02:26:57 +0100 Subject: [PATCH] platform/surface: Add Surface Hot-Plug driver @@ -450,5 +450,5 @@ index 000000000000..cfcc15cfbacb +MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices"); +MODULE_LICENSE("GPL"); -- -2.31.0 +2.31.1 diff --git a/patches/5.11/0007-surface-typecover.patch b/patches/5.11/0007-surface-typecover.patch index 9cbb74f11..5b1a80f5c 100644 --- a/patches/5.11/0007-surface-typecover.patch +++ b/patches/5.11/0007-surface-typecover.patch @@ -1,4 +1,4 @@ -From 5c0caf4d38d2f819e4637bfff672a612b11543b3 Mon Sep 17 00:00:00 2001 +From 734acf1cdb8b13bfe4891393e19d44f50b34c03e 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 @@ -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.0 +2.31.1 diff --git a/patches/5.11/0008-surface-sensors.patch b/patches/5.11/0008-surface-sensors.patch index bf8cb3ab0..5667c0a53 100644 --- a/patches/5.11/0008-surface-sensors.patch +++ b/patches/5.11/0008-surface-sensors.patch @@ -1,4 +1,4 @@ -From d5cf2024ec3ac0682d5bea659cab215c5ac7626b Mon Sep 17 00:00:00 2001 +From b6e5c8ecffede0082f3400632ea69c76ad2c532d 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 547e7f9d6920..df0647856e5d 100644 .probe = apds9960_probe, .remove = apds9960_remove, -- -2.31.0 +2.31.1 diff --git a/patches/5.11/0009-cameras.patch b/patches/5.11/0009-cameras.patch index 60e32cb90..96a8ab451 100644 --- a/patches/5.11/0009-cameras.patch +++ b/patches/5.11/0009-cameras.patch @@ -1,4 +1,4 @@ -From 3cf9aa436dbde6acbdb12621ed4ad609b7823446 Mon Sep 17 00:00:00 2001 +From a862f67c1f5ea7795c02d8c5a228f86df4c88fd0 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 @@ -48,9 +48,9 @@ index ccf0b85ae36f..62187ab5ae43 100644 #define CIO2_DEVICE_NAME "Intel IPU3 CIO2" #define CIO2_ENTITY_NAME "ipu3-csi2" -- -2.31.0 +2.31.1 -From 84d419da7369f3930245b1c8a802d0559c713545 Mon Sep 17 00:00:00 2001 +From 09b36ff48d3590d4cd7cf94ff77d87c6228bc1a0 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 @@ -93,9 +93,9 @@ index 35b95c6ac0c6..0bf5260f14c6 100644 } EXPORT_SYMBOL_GPL(fwnode_device_is_available); -- -2.31.0 +2.31.1 -From c6bc671bda7f9d256dfee6067250a9038adac233 Mon Sep 17 00:00:00 2001 +From 09af2c4ec773c267b6a6012b0af3f48e1e4e71b7 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 @@ -137,9 +137,9 @@ index 0bf5260f14c6..1421e9548857 100644 EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id); -- -2.31.0 +2.31.1 -From 9a3021ad26fa37e441cef315a5704bcd8fc3b396 Mon Sep 17 00:00:00 2001 +From 90ea028abc995531e3d9ca8905d16c2272be06af 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 @@ -240,9 +240,9 @@ index fbfb01ff1856..edfdd67daccd 100644 } EXPORT_SYMBOL_GPL(software_node_unregister_nodes); -- -2.31.0 +2.31.1 -From 219b4afbe1999076c053fef5ce7cc659c935e2d4 Mon Sep 17 00:00:00 2001 +From 8b3e0dfa7d125c043102f776c3a3bb8e7e694200 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 @@ -295,9 +295,9 @@ index edfdd67daccd..b22290106284 100644 } EXPORT_SYMBOL_GPL(software_node_unregister_node_group); -- -2.31.0 +2.31.1 -From 191817fe576ff7af61999648f51b03df1617f2f9 Mon Sep 17 00:00:00 2001 +From b1f247a0b017e760ded7afd3646ef8d9f7851ce1 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 @@ -336,9 +336,9 @@ index fde4ad97564c..77414e431e89 100644 /** -- -2.31.0 +2.31.1 -From 0dda3b01fbce83998658a5cbe88955cbc43fd6d0 Mon Sep 17 00:00:00 2001 +From 1c4afa0c1d8e1578056f30e3fa93b3d3211cc489 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 @@ -504,9 +504,9 @@ index b22290106284..0e90bbf6e08c 100644 /* -------------------------------------------------------------------------- */ -- -2.31.0 +2.31.1 -From 2dfa15d2b2069bc79f42b4d000e10f028cfcd84d Mon Sep 17 00:00:00 2001 +From 01f352c03676e0576e66fa4b8d038e1c60c78db4 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 @@ -542,9 +542,9 @@ index 7ac87f18a10f..7d60f24240a4 100644 static void __init -- -2.31.0 +2.31.1 -From ce6db3ab8e626c4479f4f6298143f8d5c2b8eb48 Mon Sep 17 00:00:00 2001 +From d3b46a25cd6a9ad797c66fb07cc7a5246e5bdcc1 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 @@ -573,9 +573,9 @@ index d1b36e222cd1..c6c13433ecf6 100644 F: drivers/media/pci/intel/ipu3/ -- -2.31.0 +2.31.1 -From f3892d1a319390e3ca4b26fde4ea2aeedb37659c Mon Sep 17 00:00:00 2001 +From 4dc35f17cfd3f2684529bdfca38cad835806d3ce 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 @@ -608,9 +608,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.0 +2.31.1 -From f3d8fde7e10028a55590328bc9a84fffcedcc4de Mon Sep 17 00:00:00 2001 +From aa23316f049e5b9ee63d4fd36d0e383321ba4d53 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 @@ -649,9 +649,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.0 +2.31.1 -From cd230b7f379c1535c26eab15f60f32cb707542d0 Mon Sep 17 00:00:00 2001 +From 7d2626c70d016f1d8eccc61e8b8c6c1a0b56d229 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 @@ -737,10 +737,10 @@ index d5411a166685..ddca1550cce6 100644 /* diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h -index 6d1879bf9440..02a716a0af5d 100644 +index 37dac195adbb..f28b097c658f 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h -@@ -683,9 +683,16 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) +@@ -684,9 +684,16 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); @@ -758,9 +758,9 @@ index 6d1879bf9440..02a716a0af5d 100644 { put_device(&adev->dev); -- -2.31.0 +2.31.1 -From 2e8278bd9f1e8a67c2d7308586d05297d7e62c2a Mon Sep 17 00:00:00 2001 +From 1460854044827dd9f91c4c65bcf659a89a41b047 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 @@ -835,9 +835,9 @@ index 4365430eea6f..77fd6a3ec308 100644 * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties * @fwnode: pointer to the endpoint's fwnode handle -- -2.31.0 +2.31.1 -From a33a69f2fc23191ce4e71fe8fcfe09469da3274f Mon Sep 17 00:00:00 2001 +From dafcfbf1111ba26cb437a25badb0574e58c106f7 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 @@ -1433,9 +1433,9 @@ index 62187ab5ae43..dc3e343a37fb 100644 + #endif -- -2.31.0 +2.31.1 -From 230fd396127f716a9fbde95e8eaae04c579a22fa Mon Sep 17 00:00:00 2001 +From cb3292f388f9ada1e5ec5c2001abf8feb51d35bf 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 @@ -1488,10 +1488,10 @@ index be73974ce449..70c7d9a3f715 100644 const struct lpss_device_links *link) { diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h -index e6a5d997241c..68fc6a03aed1 100644 +index cb8f70842249..a7051a944c26 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h -@@ -79,6 +79,7 @@ static inline void acpi_lpss_init(void) {} +@@ -81,6 +81,7 @@ static inline void acpi_lpss_init(void) {} #endif void acpi_apd_init(void); @@ -1535,9 +1535,9 @@ index ddca1550cce6..78b38775f18b 100644 * acpi_dev_present - Detect that a given ACPI device is present * @hid: Hardware ID of the device. -- -2.31.0 +2.31.1 -From 60a373610c9c8d118c63ac824373e62155e5235d Mon Sep 17 00:00:00 2001 +From 59c8dd553913386aba648d6e13b4bafad4ae42c8 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 @@ -1608,10 +1608,10 @@ index 78b38775f18b..ec6a2406a886 100644 * acpi_dev_get_next_match_dev - Return the next match of ACPI device * @adev: Pointer to the previous acpi_device matching this @hid, @uid and @hrv diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h -index 02a716a0af5d..33deb22294f2 100644 +index f28b097c658f..9bec3373f850 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h -@@ -683,6 +683,8 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) +@@ -684,6 +684,8 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); @@ -1621,9 +1621,9 @@ index 02a716a0af5d..33deb22294f2 100644 acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv); struct acpi_device * -- -2.31.0 +2.31.1 -From c28409d9a56e2b670866cea96bcbc44644332abe Mon Sep 17 00:00:00 2001 +From e6a5e2c467e1858a51f77ab8e99997ad634e0d92 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() @@ -1689,9 +1689,9 @@ index 56622658b215..65acae61dc5c 100644 { return NULL; -- -2.31.0 +2.31.1 -From 5888b5ddc03295ee8a5c7421c092d39aa57027d9 Mon Sep 17 00:00:00 2001 +From 887f95ebe902109e8a5a087a8eeacbe9f88a68b1 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() @@ -1747,9 +1747,9 @@ index 65acae61dc5c..b82aac05b17f 100644 #else static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, -- -2.31.0 +2.31.1 -From ca5f503b38dd978d141ccfaa4063bf65100bf647 Mon Sep 17 00:00:00 2001 +From 7cec4fc942eb58ee7e9a00b2dc23b2541cf6aa68 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() @@ -1767,7 +1767,7 @@ Patchset: cameras 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c -index 495f779b2ab9..00d183165ce3 100644 +index 1aacd2a5a1fd..94a3d3d05560 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -111,7 +111,7 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) @@ -1811,9 +1811,9 @@ index b20568c44001..c085527b7a86 100644 static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) -- -2.31.0 +2.31.1 -From 42dceee8b2eba8a27c308ddd6126d1c331258fcc Mon Sep 17 00:00:00 2001 +From d0bfb53f261e4e6bed3225b037607ec2a3224417 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 @@ -2002,9 +2002,9 @@ index 4a4df4ffd18c..000000000000 -}; -builtin_i2c_driver(tps68470_driver); -- -2.31.0 +2.31.1 -From 53ab798017645a4264f882e438c005c20d4717aa Mon Sep 17 00:00:00 2001 +From 74e8f3602c481fabf6ed94647f868a4e59d2fb0f 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 @@ -2971,9 +2971,9 @@ index 000000000000..3fe27ec0caff + return ret; +} -- -2.31.0 +2.31.1 -From 0a56179379de0aa8ca9211f4930a1b2185789bca Mon Sep 17 00:00:00 2001 +From b18f93cfb39c50afe95d82639b64f6a1023abd0c 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 @@ -6328,9 +6328,9 @@ index 000000000000..9a508e1f3624 +static unsigned long N_RES = N_RES_VIDEO; +#endif -- -2.31.0 +2.31.1 -From 101d1bb6fa718bc0066ff09dc811112bada7f3e2 Mon Sep 17 00:00:00 2001 +From 8f4c79dd97e90bc897f6a5b10d7c66704c04238c 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 @@ -6369,9 +6369,9 @@ index 32485e4ed42b..f9ced52ad37a 100644 if (dev->indicator_led) -- -2.31.0 +2.31.1 -From 74fbb0f533698c523eea52282ebac37decaff73e Mon Sep 17 00:00:00 2001 +From ef8789b844dd5d06a0b0c08b79881e569316dcd1 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 @@ -6398,9 +6398,9 @@ index f9ced52ad37a..9fd44a3d1d85 100644 clk_disable_unprepare(dev->clk); -- -2.31.0 +2.31.1 -From 5e5aa323d4c336e9ef2da347255af50ff497d6b3 Mon Sep 17 00:00:00 2001 +From c72a05141abd6c0ac5e05103db7df160949b99c4 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 @@ -6561,9 +6561,9 @@ index dd0ffcafa489..924d99d20328 100644 struct property_entry ep_properties[5]; struct property_entry dev_properties[3]; -- -2.31.0 +2.31.1 -From 29428e4ea53c791b7bb83f536e73889908ab79e4 Mon Sep 17 00:00:00 2001 +From 85152bfac87df38eaddba3c5150f07caddcc82ea 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 @@ -6617,9 +6617,9 @@ index 9fd44a3d1d85..1a85800df7ed 100644 ov5693->ctrl_handler.lock = &ov5693->input_lock; ov5693->sd.ctrl_handler = &ov5693->ctrl_handler; -- -2.31.0 +2.31.1 -From acf832b5d5736badf655fd7a1fe605c387ab615e Mon Sep 17 00:00:00 2001 +From f992f297784316f6d0de988d71f83f77d0bb9a37 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 @@ -7034,9 +7034,9 @@ index 3fe27ec0caff..40629291b339 100644 return -EINVAL; -- -2.31.0 +2.31.1 -From 13a30985637a2bc2a21363aa8a39f57b61f006f2 Mon Sep 17 00:00:00 2001 +From e927b3f79c65441b37e113506d001de75cd1c07f 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 @@ -7161,9 +7161,9 @@ index 42ae8396eb64..98eb1ec3399e 100644 acpi_dev_put(int3472->sensor); -- -2.31.0 +2.31.1 -From 5518f3688834aff07a66a7d1aaa4feb713e6ffdb Mon Sep 17 00:00:00 2001 +From 41fd5809196e7734acb1f90b9f04ee529aab4258 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 @@ -7265,9 +7265,9 @@ index 924d99d20328..e1e388cc9f45 100644 (const struct cio2_sensor_config) { \ .hid = _HID, \ -- -2.31.0 +2.31.1 -From f0f2d2ea5eb8c916c55b63928e2921a248311078 Mon Sep 17 00:00:00 2001 +From dae18ee24f66def6b507b6aa90c353d1f50091e9 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() @@ -7387,9 +7387,9 @@ index 9a508e1f3624..26819cf3f4d2 100644 enum ov5693_tok_type { -- -2.31.0 +2.31.1 -From 4baa97014079ab310df40d3658e600e92d0d65fd Mon Sep 17 00:00:00 2001 +From bf3dee764cad64dd391027b0c04a1cdbc1ff4345 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 @@ -7425,9 +7425,9 @@ index a9747ab783d7..7fb368eec327 100644 V4L2_CID_HBLANK, hblank, hblank, 1, hblank); -- -2.31.0 +2.31.1 -From f34d3d9407a445b1e693467079c2f606c402737b Mon Sep 17 00:00:00 2001 +From ac8d659bfc04a21150a4730127437655b17fdbd1 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 @@ -7501,9 +7501,9 @@ index 26819cf3f4d2..9d7eed97963b 100644 }; -- -2.31.0 +2.31.1 -From d84671fbbac83d353317ca795844ea8792093054 Mon Sep 17 00:00:00 2001 +From 9f98a7057b9ac247b68143403ba7992398a1f39c 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 @@ -7576,9 +7576,9 @@ index 1950d7ac2d54..cea767230aa9 100644 /* Gain */ -- -2.31.0 +2.31.1 -From 22de9ffa3907243fe5a782d240114af9aa0303e3 Mon Sep 17 00:00:00 2001 +From cff5df4d5026831ad0387555ced085fb07ed22c2 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 @@ -7612,9 +7612,9 @@ index cea767230aa9..f681dbfcec56 100644 #define OV5693_GAIN_CTRL_H_REG 0x3504 -- -2.31.0 +2.31.1 -From f712b5267439ff50424ce9a43177efb340d78f04 Mon Sep 17 00:00:00 2001 +From 8d357b35dfb0d08e8a97b4ddbb0a869cba1b6527 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 @@ -7762,9 +7762,9 @@ index 9d7eed97963b..965208078c2b 100644 }; -- -2.31.0 +2.31.1 -From ed6c7b8099e430deefc7d538e15c7506202e7e17 Mon Sep 17 00:00:00 2001 +From e05103e7a7bb523d6dc604af6c658bcf94f8cb53 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 @@ -7834,9 +7834,9 @@ index f681dbfcec56..51eb3b05d121 100644 /* Flip */ -- -2.31.0 +2.31.1 -From b0a324eb8fa9bad2a4ef03a9f79f56790b051c4a Mon Sep 17 00:00:00 2001 +From 41237dc785ec38989b01ba830a496b4555ebacc1 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 @@ -7897,9 +7897,9 @@ index 51eb3b05d121..952558c4f33b 100644 } -- -2.31.0 +2.31.1 -From eeceaf12fdf9c7acc64852e1de04de5dc7867915 Mon Sep 17 00:00:00 2001 +From 99fc6ab27cb5ed985c9b01b5bb420bdf3ef421c6 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 @@ -7932,9 +7932,9 @@ index 952558c4f33b..dd31083eeb7b 100644 enable ? OV5693_START_STREAMING : OV5693_STOP_STREAMING); -- -2.31.0 +2.31.1 -From a9f212e888cfc940e60ec8cedc4903c3a4650448 Mon Sep 17 00:00:00 2001 +From 5380d82d6093965bc4e27a648c68b9a103750708 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 @@ -7971,9 +7971,9 @@ index 965208078c2b..7f1d31a82d3d 100644 #define OV5693_NUM_SUPPLIES 2 -- -2.31.0 +2.31.1 -From 7eebfc822df3632535bfc240e2c44d9fc7258edd Mon Sep 17 00:00:00 2001 +From a263f02959a5e6c621dd4898d007e553b7658915 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 @@ -8892,9 +8892,9 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644 struct regulator_bulk_data supplies[OV5693_NUM_SUPPLIES]; struct clk *clk; -- -2.31.0 +2.31.1 -From f921b89352253ca6e531e80dcbb5522d1cfbda31 Mon Sep 17 00:00:00 2001 +From 34e04de9d28d5cab4d774571e34cf3a48151a532 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 @@ -9237,9 +9237,9 @@ index 70ccb3aae4c7..b78d3b474a43 100644 struct camera_sensor_platform_data *platform_data; ktime_t timestamp_t_focus_abs; -- -2.31.0 +2.31.1 -From ee6d3bde2367b58f48ae74e243c5ca21dd525f30 Mon Sep 17 00:00:00 2001 +From c9c05da1003a210cb640d702692c9342c4e99772 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 @@ -9408,9 +9408,9 @@ index f2eaa5f71a31..ce26ce86fbd5 100644 .pad = &ov5693_pad_ops, }; -- -2.31.0 +2.31.1 -From 61b96dfcb6a9b28df30147352f4fb283b71bfec9 Mon Sep 17 00:00:00 2001 +From b07484e0cd4e9506867917ef52ecccd6a69667ff 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 @@ -9449,9 +9449,9 @@ index ce26ce86fbd5..b3b391a49fdb 100644 #include -- -2.31.0 +2.31.1 -From 9957063952ec0579febb1f678e320588b2548a5b Mon Sep 17 00:00:00 2001 +From 274b0b925baae9f1e53a752c88385b5c979ed292 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 @@ -9868,9 +9868,9 @@ index b3b391a49fdb..2c82b6578de9 100644 v4l2_i2c_subdev_init(&ov5693->sd, client, &ov5693_ops); -- -2.31.0 +2.31.1 -From 8fa8c17757205c2aa96ec7ae02b3b5cba0687276 Mon Sep 17 00:00:00 2001 +From 90cffdd84b37527c0c3388a7cea46fdb35332764 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 @@ -10024,9 +10024,9 @@ index 2c82b6578de9..313bc9177328 100644 mutex_unlock(&ov5693->lock); return ret; -- -2.31.0 +2.31.1 -From 7f286eae4ff5d865d78164c9ee0eea9b4cd87658 Mon Sep 17 00:00:00 2001 +From 099cd765637012f55da05aaf11d449d514b127ca 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 @@ -10170,9 +10170,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.0 +2.31.1 -From 98cd92d4817034e83ea2d2afebd792362111b698 Mon Sep 17 00:00:00 2001 +From aa3547e6be1672102cf393e0adb99ab5aa3c3a50 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 @@ -10200,9 +10200,9 @@ index 313bc9177328..d092ed698eb3 100644 return -ENOMEM; -- -2.31.0 +2.31.1 -From 7df28396c6d03d99d1ce5cfd12769e0ffa4d332b Mon Sep 17 00:00:00 2001 +From 6eb233569bc69ec7584ea75d056fc635119f7862 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 @@ -10257,9 +10257,9 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644 #define OV5693_LINK_FREQ_400MHZ 400000000 /* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample -- -2.31.0 +2.31.1 -From 4dc179ed440fe7e3a3f82e6537093cdb055440e4 Mon Sep 17 00:00:00 2001 +From 1c0497718345989afd2c3115044ab8c162f3f37b 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 @@ -10331,9 +10331,9 @@ index 8082d37841da..c580159079d2 100644 static int ov5693_get_regulators(struct ov5693_device *ov5693) -- -2.31.0 +2.31.1 -From 3ba5ef360f0f5dfc70b9b566c118f40d7f08c5c7 Mon Sep 17 00:00:00 2001 +From b1a98903cb2b44b3a6f7ce8c434488614341f4e1 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 @@ -10374,9 +10374,9 @@ index c580159079d2..9f61b470f8ba 100644 ov5693->supplies); } -- -2.31.0 +2.31.1 -From 154405f25059dfe2fa70b81425fa497e8d686b74 Mon Sep 17 00:00:00 2001 +From 6818d9204ac355ffe9d76c4595ad79ca1210e85b 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 @@ -10453,9 +10453,9 @@ index 9f61b470f8ba..622a7ddf4063 100644 return 0; } -- -2.31.0 +2.31.1 -From f860c535401b0981c4670e452b960463515d79cb Mon Sep 17 00:00:00 2001 +From 0558995490cbfa908ec9145ae13168e8e49c0cab 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 @@ -10882,9 +10882,9 @@ index 0dfbbe9a0ff2..29e6735112da 100644 static unsigned long N_RES = N_RES_VIDEO; -#endif -- -2.31.0 +2.31.1 -From 831f231d6f00ecc79ea6daa973fc21d31063af39 Mon Sep 17 00:00:00 2001 +From d09d0a90de5ffc707922780c8126135083abc0a8 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 @@ -11123,5 +11123,5 @@ index 29e6735112da..0377853f8b2b 100644 int otp_size; u8 *otp_data; -- -2.31.0 +2.31.1 diff --git a/patches/5.11/0010-ath10k-firmware-override.patch b/patches/5.11/0010-ath10k-firmware-override.patch index 556ca075d..3ef0eb426 100644 --- a/patches/5.11/0010-ath10k-firmware-override.patch +++ b/patches/5.11/0010-ath10k-firmware-override.patch @@ -1,4 +1,4 @@ -From 35d1a8ada80a3db92d7b447bb412a4545b54a010 Mon Sep 17 00:00:00 2001 +From 2989c38ea867930aa4f52f2d0e4669717d6dc1bb 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 a419ec7130f9..b2c21bf5995e 100644 ret = firmware_request_nowarn(&fw, filename, ar->dev); ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", -- -2.31.0 +2.31.1 diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD index dc2bab30c..b76d545b6 100644 --- a/pkg/arch/kernel/PKGBUILD +++ b/pkg/arch/kernel/PKGBUILD @@ -47,16 +47,16 @@ sha256sums=('3cac049b89b2d3cac3e03540e424b8cf99dd9bc596e8e72b69026e05ba8e7687' 'd8d5d11c80424985642b0eea6ace3256b5a1e5e69d637104523460a5ebdda202' '3fbd134c61de6f4fa86567bb0faf02c4eb2c54111b6dc45367b8f6e9ef06556e' '9474de18769968c5558fedda5be354fe0babf1365541d4d0ac8e1ac47d4bbb88' - '1a2bba00f08f3587fde1692043af956b9efd08a4526bdc1a50fa15476c6ed873' - 'ba2127667105305ca22e59d33f82c5630b931cf1f9d55ab3afcbab7d575ec808' - '4d8d839bd9dcee096bd071ef01f801e766fc2a4e91f7ec85b94f0147092bd4a6' - '31ff1e5fbc34aa0125315b675ace10ce6c43c4a5983ec23be17d9c8e7f2a3dc8' - '937f6be1b1cdc3822122ba84cd4404a2bdc439a959757f0c3d4ab6077032c1cd' - '8eb282d5120d6cca591765d65057c586a6562de92ef49236d6a76f8ad7cf1704' - 'a8614647368a23487de0e241f2b533de4f462b5f575c21971e823f54ce925f53' - '7a03877f503348de5f7f66a238519ccf902b837ac9b8035a4022adeb3901a1b3' - 'f89fd320baff454cb42ff6a78beada8f9eac430b7c80a51f10c43e5df7d2e414' - '9b2c03265f770955fbedc64dcf25dda684c88bae0bf6467a1f3d1153b92c0971') + '40e2e8f445942b57a348332f7de13ce2653716113ebf79b2d4b2d89155821624' + '582bf4d14e19dea0ed53ad8f1906d1b372959a95426ec2af65554f0bc292d854' + '5c89868a5ddc4f4236950c01dfac2a1c6b6a8deaf79cffcf0a71e35bbe336924' + 'fe685638edb5176c26db1f33dd53f322f619ccb58165100838b536c3f277fd4b' + '09da70eeb31b51316e44fbf41db620adbbd6b3e149b4e52796d7185ebbd1a3ae' + '966cf18981479c70b9e64ec78a3685fed374d63d26266aac9f987cb0d8d7ad6b' + 'c17bfe9d5ebf2b0e0518795585de19d3c8605afc3ced3b11b65d5068ec842b19' + '7a5b776b58587e6345709dec7e2bfa3cd9984a8f212c4704c4076ad4020cc261' + '8a6da5b8a12ff2cebe2b787ef51153a38940d8ccf526eb5bc96e0a01c5a1592e' + '60ebeea43bd725bcd401949f30b12b41d5b379846718c0377739d258e8ce08e3') export KBUILD_BUILD_HOST=archlinux