Browse Source

Update v5.11 patches

Changes:
 - Update patches to v5.11.7

 - SAM:
   - Small code cleanup

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/f94094df0a37cb6f014f4ecd61604412d4fa5495
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/53fbf8d1f862d719612525e0c342b74173fbcb8c
Maximilian Luz 4 years ago
parent
commit
2e1ff0ee2c

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

@@ -1,4 +1,4 @@
-From e9ccabbc550117695c61332c352e8d7b56753c0c Mon Sep 17 00:00:00 2001
+From 11492b8ad14c2f400a50abd8e4655a841294558c Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
@@ -97,5 +97,5 @@ index 2752dc955733..ef36a316e2ed 100644
  };
  
 -- 
-2.30.1
+2.30.2
 

+ 20 - 20
patches/5.11/0002-wifi.patch

@@ -1,4 +1,4 @@
-From ce8e4eee82fee52fb1531ba7c1c6f4a204605baf Mon Sep 17 00:00:00 2001
+From 1488bfbdd03dc5f3903c71b91719d27e24a6c0f2 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 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.30.1
+2.30.2
 
-From c9806809f41fcc75c4d249558e04433ee78edc30 Mon Sep 17 00:00:00 2001
+From 4871ed416a4bcbab7907167c9eaebdcd93e04cae Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 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.30.1
+2.30.2
 
-From 478260a1e225edee0564f910fd50092355d8cdd3 Mon Sep 17 00:00:00 2001
+From 0cb80deaf51fc408ab60c7b65508a40c7b167508 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:32:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@@ -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.30.1
+2.30.2
 
-From 6f0697a2d9cf1b8513471d8f8eda3befd0235793 Mon Sep 17 00:00:00 2001
+From 8751a784f243553c65ba7d215d26cefc9571d2fe Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Wed, 30 Sep 2020 18:08:24 +0900
 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@@ -646,9 +646,9 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
  		.ident = "Surface Pro 3",
  		.matches = {
 -- 
-2.30.1
+2.30.2
 
-From 93addb19794e6eb4cfcda6602038b595f0e46242 Mon Sep 17 00:00:00 2001
+From 30b13373c61b8f7544f4ec661cb0a0e01842e525 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Thu, 24 Sep 2020 01:56:34 +0900
 Subject: [PATCH] mwifiex: pcie: use shutdown_sw()/reinit_sw() on
@@ -765,9 +765,9 @@ index bf9ef4ede3f1..30a602a18f9d 100644
  	return 0;
  }
 -- 
-2.30.1
+2.30.2
 
-From 619adb8c8d0277c326a8f70441a4818b3077ca4b Mon Sep 17 00:00:00 2001
+From 0be2e8316621230bb7529c8e9067d6117c051603 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 24 Aug 2020 17:11:35 +0900
 Subject: [PATCH] mwifiex: pcie: add enable_device_dump module parameter
@@ -814,9 +814,9 @@ index 30a602a18f9d..113636355dec 100644
  	if (!adapter->devdump_data) {
  		mwifiex_dbg(adapter, ERROR,
 -- 
-2.30.1
+2.30.2
 
-From 3a8c34e479f994373b4fd38c68962deb76aee6c7 Mon Sep 17 00:00:00 2001
+From 264838e5b5383b14e40f4cc196abefa690d1d859 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -969,9 +969,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.30.1
+2.30.2
 
-From 091be09b019eda77ca544bb13a5481ebc6a7c9a1 Mon Sep 17 00:00:00 2001
+From e70c8a87dd34dcde524bd13ad6bbcdd62617a08e Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:25:48 +0900
 Subject: [PATCH] mwifiex: add allow_ps_mode module parameter
@@ -1031,9 +1031,9 @@ index a6b9dc6700b1..943bc1e8ceae 100644
  }
  
 -- 
-2.30.1
+2.30.2
 
-From 812dbb8f06dd6c9f9923e2fef13d7ff93dbeb7c3 Mon Sep 17 00:00:00 2001
+From 9d7468b0241457b8cff8798224f649ef61374a85 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:38:48 +0900
 Subject: [PATCH] mwifiex: print message when changing ps_mode
@@ -1066,9 +1066,9 @@ index 943bc1e8ceae..a2eb8df8d385 100644
  }
  
 -- 
-2.30.1
+2.30.2
 
-From e6fc5f004273fe3f5dc71e47d839e24c67ff0187 Mon Sep 17 00:00:00 2001
+From 5fa74c3c58172e900c5963470349522907e17aa6 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:59:37 +0900
 Subject: [PATCH] mwifiex: disable ps_mode explicitly by default instead
@@ -1114,5 +1114,5 @@ index d3a968ef21ef..9b7b52fbc9c4 100644
  
  		if (drcs) {
 -- 
-2.30.1
+2.30.2
 

+ 6 - 6
patches/5.11/0003-ipts.patch

@@ -1,4 +1,4 @@
-From 59cd8351a53682899325c43daaff7c6a314f4ffb Mon Sep 17 00:00:00 2001
+From 0af559d599e26e22dbd9d48df6011674fe872d4c Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 30 Jul 2020 13:21:53 +0200
 Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@@ -34,9 +34,9 @@ index 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.30.1
+2.30.2
 
-From fefc86d977d0ac1bf0992eca084325c5cc55742f Mon Sep 17 00:00:00 2001
+From 14a1ecff6afa2411c31b5797eaab950419f76c21 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 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.30.1
+2.30.2
 
-From 5616edbf3d4709ea3a44e4126981a763d56984c1 Mon Sep 17 00:00:00 2001
+From b3d131d48a4585e8f02f87cddf57d950427e8541 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 6 Aug 2020 11:20:41 +0200
 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus
@@ -1530,5 +1530,5 @@ index 000000000000..53fb86a88f97
 +
 +#endif /* _IPTS_UAPI_H_ */
 -- 
-2.30.1
+2.30.2
 

+ 4 - 4
patches/5.11/0004-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 4b5e30fbedddfa4eb0aa76d03c60e884968fe964 Mon Sep 17 00:00:00 2001
+From 68cd14de7a5df97b8dba160a116fe5596c84fee4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -108,9 +108,9 @@ index 37c510d9347a..aed579942436 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.30.1
+2.30.2
 
-From 57c502dbc48850cdbae683f2b703e54c3ac26467 Mon Sep 17 00:00:00 2001
+From c6612d79e80e2fd300ef5ca9d35ddc0c1658bdcd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
@@ -330,5 +330,5 @@ index 000000000000..8b816ed8f35c
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 

+ 108 - 67
patches/5.11/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From d501d2140e2dc54a5d99988ba98dbfd6444f2bbe Mon Sep 17 00:00:00 2001
+From ac8ce29f97a7e4283006d5487858f7481c8f88e0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From a5b7ae79f792640dc79474da5be422c6e4dd5477 Mon Sep 17 00:00:00 2001
+From 4aca10233239ba18ccdd6c6ea4f4e4fa752a2591 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 988a56392c1e49e18ddfd3e185b97d8b280cc4ab Mon Sep 17 00:00:00 2001
+From 713a29e397995cc3ed6fdf9b5b3ae2db84eafaec Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From dbc4ef3bb20b2219f42800683c52807790589050 Mon Sep 17 00:00:00 2001
+From ba922482ece91e378e66cd859c21478f75e3b35a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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 <trace/define_trace.h>
 -- 
-2.30.1
+2.30.2
 
-From 9a6408b60fe57adb7962cabeadc18e914e25815b Mon Sep 17 00:00:00 2001
+From 10839d18b1dc77bc91b759cb58399adebd08ad77 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 0ed8048c061dc8066a03efcb18649d313595daaa Mon Sep 17 00:00:00 2001
+From 740abde0aabc40926ed95d87681bbe0be0912760 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 942a3345fa7c106a7c21652d613c011a2bee8158 Mon Sep 17 00:00:00 2001
+From b3ad47735284dcdaf63aacd1a90e3f38f119f549 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 21 Dec 2020 19:39:57 +0100
 Subject: [PATCH] docs: driver-api: Add Surface Aggregator subsystem
@@ -13689,9 +13689,9 @@ index 2818a31d79db..c89d831e74e0 100644
  F:	include/linux/surface_aggregator/
  
 -- 
-2.30.1
+2.30.2
 
-From b18187e91146963b7d8b95614f2e95858dbe66b7 Mon Sep 17 00:00:00 2001
+From 59a21b4afe5ffd5dead6b8ce596d8c7fe4f55516 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From ffdb38a97b3ed9b99a17954a733491ab144eb1b8 Mon Sep 17 00:00:00 2001
+From 1b5d10df51f5e3ead7a4e70b7b128e5f67f24960 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From d0c9ae12fba197f2b36046a22f6d784a0d2475e0 Mon Sep 17 00:00:00 2001
+From 5cd439a8dbf6fec296c3dc86092efc23a488595c Mon Sep 17 00:00:00 2001
 From: Colin Ian King <colin.king@canonical.com>
 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.30.1
+2.30.2
 
-From 11ffaa764df755d12a14176b203044b7e076fb77 Mon Sep 17 00:00:00 2001
+From 56d736d40a576959ca96b7829166586910d59e0c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 08fcb5aabe345920327295828a343cb21b38266f Mon Sep 17 00:00:00 2001
+From 60e3d0bba61f5b5c1e93e0e2ee617e7ba8ff39af Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From e40f24dbc901fdfa623d1ad48dc189fa0cd2cf05 Mon Sep 17 00:00:00 2001
+From 4a3f5aa682a8f88dd30f625025d49782889e8a59 Mon Sep 17 00:00:00 2001
 From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 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.30.1
+2.30.2
 
-From 8a72a107fc7ba9bf27295ab263ae7d218821a861 Mon Sep 17 00:00:00 2001
+From 0cd74897b769d4dd4e8a553ba55a26b0874f8823 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 2e25eccababb35a7df5e7078af331b1545eb7091 Mon Sep 17 00:00:00 2001
+From 5e39e09bf518b0db5ac27409388cb8a3bb90d7fb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From a9118a4d20085508588984edc8d93ef3d09c6fd4 Mon Sep 17 00:00:00 2001
+From a36768ee23b981a1035bcf38e089ef131c351a8d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From c79e18e307808826e6dce7131c727deb9c25d12c Mon Sep 17 00:00:00 2001
+From ed6769d001c0375b055ee305c5428345569919f4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 55068c44b24b551e8db338ebea187adfaaf6a322 Mon Sep 17 00:00:00 2001
+From 4845b4b5e713be0053ca231b692113e484c2d4cf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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 <luzmaximilian@gmail.com>");
  MODULE_DESCRIPTION("Device-registry for Surface System Aggregator Module");
 -- 
-2.30.1
+2.30.2
 
-From 5091d9c2501775903682f1a155b34e6df2acefaf Mon Sep 17 00:00:00 2001
+From 0227617f146c0b3334b25b3326732be2c55703da Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From d640cf19b11b6cd362f33e9e2b3f4ee47c3618c4 Mon Sep 17 00:00:00 2001
+From b05ed9016c7b47ba213729df92fb77f267f139ea Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 9eb068b50213c8d57ff7bb360c3e57a54c2768f5 Mon Sep 17 00:00:00 2001
+From 43154320f9d73b6d1a82b8855abd76347b06fab7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From b25c456e6bc32c93b667a4c41d225b2af6c09413 Mon Sep 17 00:00:00 2001
+From 955bd16c7d12fa917558dd5d64d28fa70b4e29c3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.30.1
+2.30.2
 
-From 8786955a1f821d5ee4d13b1c19af2541653f2dfb Mon Sep 17 00:00:00 2001
+From 9a690b4624791102095bada31fe116a42aefc42e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 9 Mar 2021 17:03:15 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -16819,9 +16819,50 @@ index caee90d135c5..6de74e893d06 100644
  	{ "MSHW0107", (unsigned long)ssam_node_group_sb2 },
  
 -- 
-2.30.1
+2.30.2
 
-From 83ab20b8c641c93335439bccd9e083bc53596fba Mon Sep 17 00:00:00 2001
+From 7ba665f0a64ac65b54b8fa14f66ad716fc59d256 Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <weiyongjun1@huawei.com>
+Date: Tue, 9 Mar 2021 13:15:00 +0000
+Subject: [PATCH] platform/surface: aggregator_registry: Make symbol
+ 'ssam_base_hub_group' static
+
+The sparse tool complains as follows:
+
+drivers/platform/surface/surface_aggregator_registry.c:355:30: warning:
+ symbol 'ssam_base_hub_group' was not declared. Should it be static?
+
+This symbol is not used outside of surface_aggregator_registry.c, so this
+commit marks it static.
+
+Fixes: 797e78564634 ("platform/surface: aggregator_registry: Add base device hub")
+Reported-by: Hulk Robot <hulkci@huawei.com>
+Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
+Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
+Link: https://lore.kernel.org/r/20210309131500.1885772-1-weiyongjun1@huawei.com
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Patchset: surface-sam
+---
+ drivers/platform/surface/surface_aggregator_registry.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index 6de74e893d06..304d601980ed 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -352,7 +352,7 @@ static struct attribute *ssam_base_hub_attrs[] = {
+ 	NULL,
+ };
+ 
+-const struct attribute_group ssam_base_hub_group = {
++static const struct attribute_group ssam_base_hub_group = {
+ 	.attrs = ssam_base_hub_attrs,
+ };
+ 
+-- 
+2.30.2
+
+From 302380b72536e5763b84665497d74cd118a4c82e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 9 Feb 2021 02:46:40 +0100
 Subject: [PATCH] platform/surface: Add DTX driver
@@ -18310,9 +18351,9 @@ index 000000000000..0833aab0d819
 +
 +#endif /* _UAPI_LINUX_SURFACE_AGGREGATOR_DTX_H */
 -- 
-2.30.1
+2.30.2
 
-From cbce4b6b86fda90b9120a0943259d790623714ab Mon Sep 17 00:00:00 2001
+From 98b3587464dce41b5bbb51571628d0bb984e6969 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 9 Feb 2021 02:50:11 +0100
 Subject: [PATCH] platform/surface: dtx: Add support for native SSAM devices
@@ -18451,9 +18492,9 @@ index a95adc1094aa..4bb5d286bf95 100644
  MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
  MODULE_DESCRIPTION("Detachment-system driver for Surface System Aggregator Module");
 -- 
-2.30.1
+2.30.2
 
-From 7acdf3f22691ea81328bd4d3fe80c8c9e8914cc5 Mon Sep 17 00:00:00 2001
+From 3167cf4b4888fe2493ffd3080fb263bff616a86f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 9 Feb 2021 02:55:31 +0100
 Subject: [PATCH] docs: driver-api: Add Surface DTX driver documentation
@@ -19219,9 +19260,9 @@ index 8ea459fc56f4..ba2dfafeb28c 100644
  F:	include/uapi/linux/surface_aggregator/dtx.h
  
 -- 
-2.30.1
+2.30.2
 
-From 1ac0425ccc915648bb5e136f79eff64ae51d8e45 Mon Sep 17 00:00:00 2001
+From 3c31a1226a51cc499c825ac33bcca84bcae33b12 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 11 Feb 2021 20:02:57 +0100
 Subject: [PATCH] input: Add bus ID for Surface Aggregator Module
@@ -19248,9 +19289,9 @@ index 9a61c28ed3ae..3e81ea3d7df2 100644
  /*
   * MT_TOOL types
 -- 
-2.30.1
+2.30.2
 
-From 28d661771a3edbd8dba2c03b58200021b51b9619 Mon Sep 17 00:00:00 2001
+From 1d310b0b0234751ab992fdbfb802526ac9dcf33c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 11 Feb 2021 20:08:50 +0100
 Subject: [PATCH] HID: Add support for Surface Aggregator Module HID transport
@@ -19991,9 +20032,9 @@ index 000000000000..4b1a7b57e035
 +
 +#endif /* SURFACE_HID_CORE_H */
 -- 
-2.30.1
+2.30.2
 
-From 06b730bfa7ae353acda87086de464c4430dd21f9 Mon Sep 17 00:00:00 2001
+From 31cd43e3d1997502e00b13ee48807c02009dd496 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 11 Feb 2021 20:10:17 +0100
 Subject: [PATCH] HID: surface-hid: Add support for legacy keyboard interface
@@ -20383,9 +20424,9 @@ index 000000000000..0635341bc517
 +MODULE_DESCRIPTION("HID legacy transport driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 
-From ae5f2370627050e0371686a7a1f2bdf17920eddf Mon Sep 17 00:00:00 2001
+From b9962fe5773fa4ac9fdc507a457213eef7a07bf5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 12 Feb 2021 21:06:12 +0100
 Subject: [PATCH] power: supply: Add battery driver for Surface Aggregator
@@ -21376,9 +21417,9 @@ index 000000000000..327fd7af386b
 +MODULE_DESCRIPTION("Battery driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 
-From 59806be0c63b97b7dd85f0dc99d0c8e11a34b487 Mon Sep 17 00:00:00 2001
+From 593e853102454ab8e267d50a3b1884faebaf321e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 12 Feb 2021 21:07:17 +0100
 Subject: [PATCH] power: supply: Add AC driver for Surface Aggregator Module
@@ -21756,9 +21797,9 @@ index 000000000000..982f9b9ef6f5
 +MODULE_DESCRIPTION("AC driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 
-From 543dd0fdf499152300c99786ba28b7de43c3a6ee Mon Sep 17 00:00:00 2001
+From 2839d39115c1dcd229a8f88527cbc34baf32f7cf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 19:58:50 +0100
 Subject: [PATCH] platform/surface: Add performance mode driver
@@ -21943,9 +21984,9 @@ index 000000000000..3b92a43f8606
 +MODULE_DESCRIPTION("Performance mode interface for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 
-From a361586c1ea6a5740e7cf64426d0a7946b57f700 Mon Sep 17 00:00:00 2001
+From a7bff8250b03abc68fc6f1021926f90e382e53b3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 4 Mar 2021 20:05:24 +0100
 Subject: [PATCH] platform/surface: aggregator: Make SSAM_DEFINE_SYNC_REQUEST_x
@@ -22068,7 +22109,7 @@ 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 6de74e893d06..c42b97f61a57 100644
+index 304d601980ed..eccb9d1007cd 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 {
@@ -22456,5 +22497,5 @@ index 02f3e06c0a60..4441ad667c3f 100644
  		return __raw_##name(sdev->ctrl, sdev->uid.target,	\
  				    sdev->uid.instance, ret);		\
 -- 
-2.30.1
+2.30.2
 

+ 5 - 5
patches/5.11/0006-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From c4a51a33b30769caab6ac407e3c5ce8c7658d42c Mon Sep 17 00:00:00 2001
+From 8409754327fa77eae50d8b00f762f2a1f5ae7502 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 4 Feb 2021 23:06:40 +0100
 Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
@@ -43,7 +43,7 @@ Patchset: surface-hotplug
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index ba791165ed19..0fa8e52208fe 100644
+index 9449dfde2841..50d51e30d634 100644
 --- a/drivers/pci/pci.c
 +++ b/drivers/pci/pci.c
 @@ -1800,7 +1800,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
@@ -56,9 +56,9 @@ index ba791165ed19..0fa8e52208fe 100644
  		return err;
  
 -- 
-2.30.1
+2.30.2
 
-From e795af3b2f568aa849a0f3278327fe80bc7b1fb9 Mon Sep 17 00:00:00 2001
+From c9e87b8e23244775e0ff34bf36976707eb608c32 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 5 Feb 2021 02:26:57 +0100
 Subject: [PATCH] platform/surface: Add Surface Hot-Plug driver
@@ -442,5 +442,5 @@ index 000000000000..cfcc15cfbacb
 +MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 

+ 2 - 2
patches/5.11/0007-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 886c643c9affeb43bae8ad1713bd1e19f8368cf6 Mon Sep 17 00:00:00 2001
+From 25cdb4226d41cc19dfcbd6920aef5e747c2ea9e3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -229,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.30.1
+2.30.2
 

+ 2 - 2
patches/5.11/0008-surface-sensors.patch

@@ -1,4 +1,4 @@
-From 7202f640893255d3291bf1dbeb44fc26876b7d5b Mon Sep 17 00:00:00 2001
+From 452fdfa057ebe6a7f64cc99c77c5fedaa8de2929 Mon Sep 17 00:00:00 2001
 From: Max Leiter <maxwell.leiter@gmail.com>
 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.30.1
+2.30.2
 

+ 114 - 114
patches/5.11/0009-cameras.patch

@@ -1,4 +1,4 @@
-From 87808db00a9bec80f5c7e61af87d8920c1140276 Mon Sep 17 00:00:00 2001
+From 5e0db9203b307a7eb9af7f888e1cb23cc6078cd2 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 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.30.1
+2.30.2
 
-From 7d3ab2200e50851ec1020f291231b7f9b98e857b Mon Sep 17 00:00:00 2001
+From 0c3dd9a8fb38fd61ebabc254ceab9568f5edadba Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From fbcf60d36e7a531adc97e0a1b46ae8ce45feee65 Mon Sep 17 00:00:00 2001
+From 907568ade701706c52db5ada861d06086419402d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 0610f7bece4792c305fde64c2a50c1bf366e0e49 Mon Sep 17 00:00:00 2001
+From b8173132178b10a5efd83839c9a1e24082bc3ee7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 25 Oct 2020 22:49:08 +0000
 Subject: [PATCH] software_node: Enforce parent before child ordering of nodes
@@ -164,7 +164,7 @@ Patchset: cameras
  1 file changed, 30 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
-index 4fcc1a6fb724..166c5cc73f39 100644
+index fbfb01ff1856..edfdd67daccd 100644
 --- a/drivers/base/swnode.c
 +++ b/drivers/base/swnode.c
 @@ -692,7 +692,11 @@ swnode_register(const struct software_node *node, struct swnode *parent,
@@ -240,9 +240,9 @@ index 4fcc1a6fb724..166c5cc73f39 100644
  }
  EXPORT_SYMBOL_GPL(software_node_unregister_nodes);
 -- 
-2.30.1
+2.30.2
 
-From d295abae3b2f332c1687829eb1513e02f54c88b8 Mon Sep 17 00:00:00 2001
+From a1f61094b389d93a8e6cf0f5e08264b0069e9146 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 21 Oct 2020 22:25:03 +0100
 Subject: [PATCH] software_node: unregister software_nodes in reverse order
@@ -263,7 +263,7 @@ Patchset: cameras
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
-index 166c5cc73f39..6f7443c6d3b5 100644
+index edfdd67daccd..b22290106284 100644
 --- a/drivers/base/swnode.c
 +++ b/drivers/base/swnode.c
 @@ -779,16 +779,23 @@ EXPORT_SYMBOL_GPL(software_node_register_node_group);
@@ -295,9 +295,9 @@ index 166c5cc73f39..6f7443c6d3b5 100644
  }
  EXPORT_SYMBOL_GPL(software_node_unregister_node_group);
 -- 
-2.30.1
+2.30.2
 
-From 2c65b3e862143735638f649a89649e82f51cc241 Mon Sep 17 00:00:00 2001
+From 1a4eae6e534912d480db0cc53d0c6ab50b550c43 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 7d7da50bc117568c5d399cdc7017e030b8194f8e Mon Sep 17 00:00:00 2001
+From 155436919a50af503a0203003dec913c8a6e6a7a Mon Sep 17 00:00:00 2001
 From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
 Date: Tue, 15 Sep 2020 15:47:46 +0100
 Subject: [PATCH] software_node: Add support for fwnode_graph*() family of
@@ -371,7 +371,7 @@ Patchset: cameras
  1 file changed, 114 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
-index 6f7443c6d3b5..9104a0abd531 100644
+index b22290106284..0e90bbf6e08c 100644
 --- a/drivers/base/swnode.c
 +++ b/drivers/base/swnode.c
 @@ -540,6 +540,115 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
@@ -504,9 +504,9 @@ index 6f7443c6d3b5..9104a0abd531 100644
  
  /* -------------------------------------------------------------------------- */
 -- 
-2.30.1
+2.30.2
 
-From 987fcc4a7f64afcf7ea9b05de6b4f936adf6744f Mon Sep 17 00:00:00 2001
+From df9365bcf1c4ebfa01bbe4fe23c52f50970b660b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 5209d9e8919d703ceb63d6f7c88c1274a7d30a25 Mon Sep 17 00:00:00 2001
+From 9d03aff220feb9ea3c7cb29115574281fa452b0e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Oct 2020 23:11:36 +0100
 Subject: [PATCH] ipu3-cio2: Add T: entry to MAINTAINERS
@@ -573,9 +573,9 @@ index a4a0519ce88c..66ce274c17d7 100644
  F:	drivers/media/pci/intel/ipu3/
  
 -- 
-2.30.1
+2.30.2
 
-From b3710b74d073a6e0c1638e52488301bfadd4c1e7 Mon Sep 17 00:00:00 2001
+From ec9d366f1259c210888d647795c8750317ef9249 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 0fa14fefa139cc528a9c24eab102a44b5979656d Mon Sep 17 00:00:00 2001
+From a243aad5b8534ec2837c1fbf5839da3fa957c5fd Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 990e177da9a00f84f6d1779c9b84fd4a5b8d83a2 Mon Sep 17 00:00:00 2001
+From 3b64a0e65a19c7cab1a57dfba6d143b9d31a288d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 15 Nov 2020 08:15:34 +0000
 Subject: [PATCH] ACPI / bus: Add acpi_dev_get_next_match_dev() and helper
@@ -758,9 +758,9 @@ index 6d1879bf9440..02a716a0af5d 100644
  {
  	put_device(&adev->dev);
 -- 
-2.30.1
+2.30.2
 
-From b62cadbe3c03cc44806af0bd2785c7798cf5830a Mon Sep 17 00:00:00 2001
+From 5af0b88107de82d0aa052e63793d3c10b8cd9daf Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From d92eb11b231d731f2f1bc96df934a08129a59297 Mon Sep 17 00:00:00 2001
+From 623daac6c5a3c1cf77224556595489947df98855 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 7ef611d32079b60fdb259e02a7e38a88704eb080 Mon Sep 17 00:00:00 2001
+From 0084db1ee29a46212979f5ab35a79d9ad9cbcf21 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 2 Dec 2020 12:38:10 +0000
 Subject: [PATCH] acpi: utils: move acpi_lpss_dep() to utils
@@ -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.30.1
+2.30.2
 
-From 926f38272c0bcefe876c97d66af84b3a9bfa0a40 Mon Sep 17 00:00:00 2001
+From 29fa2a65a4b24ea7a2bfd6894ec562cb11c384e7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 26 Nov 2020 21:12:41 +0000
 Subject: [PATCH] acpi: utils: Add function to fetch dependent acpi_devices
@@ -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.30.1
+2.30.2
 
-From 44cf4f3e3eb4d9fc28fb4bb25969f63e9ffb6e5b Mon Sep 17 00:00:00 2001
+From aee20d9e38198361a376559aa417b978925eb13c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 81c4f7153d35280aee130326b0063dfc1e7e993d Mon Sep 17 00:00:00 2001
+From de7a2ba11b6a7f0b8dd43527f5dc7f8df87a3016 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 0344c27fbf5d528d3224015a11bc714d1fafe8ef Mon Sep 17 00:00:00 2001
+From 00d6d054cded0e77fd8d565747d4f36d7beca611 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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 e37a57d0a2f0..83f9f85cd0ab 100644
+index 495f779b2ab9..00d183165ce3 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)
@@ -1788,18 +1788,18 @@ index e37a57d0a2f0..83f9f85cd0ab 100644
  static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)
  {
 diff --git a/include/linux/acpi.h b/include/linux/acpi.h
-index 053bf05fb1f7..626d43b00c4f 100644
+index b20568c44001..c085527b7a86 100644
 --- a/include/linux/acpi.h
 +++ b/include/linux/acpi.h
 @@ -1073,6 +1073,7 @@ void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const c
  bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
  				struct acpi_resource_gpio **agpio);
- int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index);
+ int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index);
 +struct gpio_desc *acpi_get_gpiod(char *path, int pin);
  #else
  static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
  					      struct acpi_resource_gpio **agpio)
-@@ -1083,6 +1084,10 @@ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
+@@ -1084,6 +1085,10 @@ static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev,
  {
  	return -ENXIO;
  }
@@ -1809,11 +1809,11 @@ index 053bf05fb1f7..626d43b00c4f 100644
 +}
  #endif
  
- /* Device properties */
+ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
 -- 
-2.30.1
+2.30.2
 
-From 6a9bc940f7bdfa0dfa25e1a0540a0d4624313746 Mon Sep 17 00:00:00 2001
+From 4780c90a39c2e82619a0330e8ec200209cde4c7b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 22cc6004e98f1ff2dd83a77278bd8f04f6f22dc6 Mon Sep 17 00:00:00 2001
+From 1ce9b701d669408fbc3bca2320c253753adce3c9 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From e0e56e5c4ec4483bc3b85d0ebbf3c2251c5d8398 Mon Sep 17 00:00:00 2001
+From b619ccbccae02127a7a7e490fc51ee6db4a1651d Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
 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.30.1
+2.30.2
 
-From b71f733a7cbdfaefad333d218a23f5902a405e7e Mon Sep 17 00:00:00 2001
+From 7008c7cc1e110d2cb29f5aba80d49c12aa916cc6 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 23d3da32422d08c3deb15c324e68944b424ff08d Mon Sep 17 00:00:00 2001
+From 193d5f339de2dc71b6ad3073c0b9353508993bcf Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 36dd147f28b485c502868acae951a61e3a034d31 Mon Sep 17 00:00:00 2001
+From 76890c8c39d9275de804e7252dd651439a4d8966 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 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.30.1
+2.30.2
 
-From 173d655455237910750b8f08f53c1fbef0ea20a2 Mon Sep 17 00:00:00 2001
+From 335693a0a095860a463e55f0c06f434626fd8e16 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 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.30.1
+2.30.2
 
-From a23bd2514938e1063b40ce374f9474ee0c738c67 Mon Sep 17 00:00:00 2001
+From 135b0054dd8e66a9de06337d358106fc9de4c1cc Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From bfa0494efc110ec10b813fa251d110e3adb651fc Mon Sep 17 00:00:00 2001
+From b0daf26490e9cd4f0bf154e90a139c269da9916b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From e0ad52e910564795fb13077e195efe47d9450d9b Mon Sep 17 00:00:00 2001
+From 04a41adcdd92296d4b19f342f03179e340389c80 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 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.30.1
+2.30.2
 
-From 7bd176a9e98e9a199232975799c180e65e2693ad Mon Sep 17 00:00:00 2001
+From a7b13ff8f42feaf7c1d29c80fecf8e0e56d23801 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 75e46b44c5e81c3eae596e9fd54e4c8a53f8c670 Mon Sep 17 00:00:00 2001
+From bc8bbeaeeb4d949fe8b89c3980eef20bec9cb893 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 99b3425614d465dff825f507cc56616549a4b6d4 Mon Sep 17 00:00:00 2001
+From 1d78ddc8bb898ece79b0716348168f406fdf1097 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 69a956301158060de1297d2c04300af6f4e23c09 Mon Sep 17 00:00:00 2001
+From db98eae83dfe22a0c2f1eda888e22dc596d1613d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From c86a8c5729d9b4cf9f193801fe56ee8ef7730ee6 Mon Sep 17 00:00:00 2001
+From efeb00cdfc879862a6c9059f15a6ec4ecb6ead08 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 7c18b8ef50454eafb757838859f0faed7efb62fc Mon Sep 17 00:00:00 2001
+From e62e8d64226776b3cd42a790e72a4a2fda17e811 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 7c1acdf7f6e92976050a3d9eab123cd9700426ab Mon Sep 17 00:00:00 2001
+From b85f8668f3beea5396ec39fdbde1e0c4b4c4e730 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 31fef3605057bace741136d282dee35da1c44bd6 Mon Sep 17 00:00:00 2001
+From baae02c2bb64ae6ea78b19c9123b9eee1f9dd2fc Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 34030f540523c5db8c6497bf4fce8ff7bed129fe Mon Sep 17 00:00:00 2001
+From 2adb26d5293d286d959750a651bf43fc0fa12de5 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 3e1edf7b50b78525cb03b2ebc209929bf343fb06 Mon Sep 17 00:00:00 2001
+From 3490179f86c2175f74a7190d376b47f5bbc92284 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From eb6ecc3d06a479b8f470da0507151e506c607d60 Mon Sep 17 00:00:00 2001
+From 0a1db7e833219342b865af21780a13fbfed32a7a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From a68625a771c755ca74154aa7d0af9bf2477096e5 Mon Sep 17 00:00:00 2001
+From feb8b98fff5b056ac13be53e7af63a81291da3c7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From eb586cf951c1a5f78774686c3cc62642fad497b1 Mon Sep 17 00:00:00 2001
+From cac338cf318ff40af30639baa99127e5603ad7f2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From e27947a296518692f81a77e17c3539519c269da8 Mon Sep 17 00:00:00 2001
+From bf3efec5a06ac86251599d38f60579aff25df9d3 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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 <media/v4l2-fwnode.h>
  
 -- 
-2.30.1
+2.30.2
 
-From 8d15bc69fe81ad66f40e822a1b26f534e78ae185 Mon Sep 17 00:00:00 2001
+From 51e0074104510541222eb159c7e8010db35a93f2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 8acae4db377a938ff089d3b673a359aac1bca75c Mon Sep 17 00:00:00 2001
+From 2129eaad596582a261633d2e1862fd9c25820a84 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 0efea969af985e646868a2e03acb61d9088c29fe Mon Sep 17 00:00:00 2001
+From c1b03a98809d85108ad18a1c729343b3ca211403 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 6b76a59d6a7964aefaffd4df2621d111398e5dff Mon Sep 17 00:00:00 2001
+From 818a12ef30abff182adce38b1071e85f2da70070 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 6cdaa6994c03c4edd4b27cda4413d62478653bf5 Mon Sep 17 00:00:00 2001
+From 94f99a2b4b329a7e734d7c5ce4e08dc455c269fd Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 05b3e1c013910ee54877cb0883ec68bde48f910d Mon Sep 17 00:00:00 2001
+From bbddf0681b06c9b5535be5fd31b7c2f0eccdae8f Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 44f8b2d74cf8d0ecda0b34119675977be5f60cc0 Mon Sep 17 00:00:00 2001
+From 2bbb3485914eeb58a3e73bf3784aead407eb16ac Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From 8851c67a028b75aa25876baeef5637872e0bddc0 Mon Sep 17 00:00:00 2001
+From 6ba293288b1c108ffdd4e2903c115d37e40f5085 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From dccc0c21df12e39bc3eb994ca23650b9445d2261 Mon Sep 17 00:00:00 2001
+From e9aa454eb3ce8a133d3466e4755343861247df41 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 
-From dcf7ffb69fd62c1ea6e821d5203346c4637cada9 Mon Sep 17 00:00:00 2001
+From 6eec190c44ab70bedee00c2d816ab5786a70e221 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 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.30.1
+2.30.2
 

+ 2 - 2
patches/5.11/0010-ath10k-firmware-override.patch

@@ -1,4 +1,4 @@
-From 8f475731fb84c2718743c8dbc03610a6f987cc1e Mon Sep 17 00:00:00 2001
+From d89a4e8b7503e57aa9870de4ce0214e4ae62d8d9 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Feb 2021 00:45:52 +0100
 Subject: [PATCH] ath10k: Add module parameters to override board files
@@ -116,5 +116,5 @@ index a419ec7130f9..b2c21bf5995e 100644
  	ret = firmware_request_nowarn(&fw, filename, ar->dev);
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.30.1
+2.30.2
 

+ 10 - 10
pkg/arch/kernel/PKGBUILD

@@ -47,16 +47,16 @@ sha256sums=('404f4381d6ec820dee761cac18028df455efe668c2ea41393fe9caff9f2a6269'
             'd8d5d11c80424985642b0eea6ace3256b5a1e5e69d637104523460a5ebdda202'
             '3fbd134c61de6f4fa86567bb0faf02c4eb2c54111b6dc45367b8f6e9ef06556e'
             '8cd2b019aac6d3807a5cdcbbbe0aad81e63193ff3e8dffd7a79d4a1421b858f6'
-            '9e7fea8b5c65b48257f54e42cacbedfb29f9c9878866d8435c8e03bc75ee6ee4'
-            '497358ccba2f03346bab2b0d152ee7aa5aa605c03081e66c8e4d8c1185f0be90'
-            'b5389b02d7a5b7ac2d2e1f1036b1feed9877db5c602f1581698cd12b429aea76'
-            'cd05489b441f7357c1fd0d74ca60b0ceafe5c798eee27fcad79a4653162a23c7'
-            'f194e1a66eec726b9dd3c828f556d2a0a31164450293cc07cee467f756efbfad'
-            'a0728b87f7abeccd9508f0bc8f5617336d6253a072a54e4d2323981dfacb5de4'
-            'bc7c63cd6f9781f04f19028cc7ca557283d4a65be56de58342cd99d4127ad04f'
-            '7d0251fd15c9c38bbd2a68120b0160f6f7db0245b2d48b6e296547f176df81cd'
-            'b5587e78db8c8a8b2b3e53dc987c9d884bc36507442e1c7440fb30deb7a9f58b'
-            '719033b5da72d233dbeb8aef4019461554a76954ea6566c012efc866a465086c')
+            '912a2886379b700594486ddc6ca03689646ac0238c88b840f996b127b8d7f49c'
+            '2bd0688ce8de5513c3a74d86ef82915a579e0b0db12b4b24bba6d40d295baa85'
+            '05898a8da5c2e3e6da3ab18021fdf6c150128863dba8dab2f11fd0ca12e3e614'
+            'b96c32592a3963d564117c378a39357a5343cf2856e28b34cfc0b5c21d999200'
+            'aef6d5de9f9122f6c1286a014cacfeca96f91dfecc4113d9f672bd8abd3aa18d'
+            '852917dec5d771df72d5ae2ba3f11922228b65ec64cf4f221fe9c571d8af053d'
+            '99d63dc8f27eda33f379937b4b7b2ed6198ffdcc81fb7a623f55625da32b79fb'
+            '8169dd5fb1fad82d5b5207e2eb5a1c082d120007216ac70856dbc26ccad2f856'
+            'e890efeb58c2ecb34a0b135c468939d5d527113851ff61110d4a1fd54d316415'
+            '9b4d749dd28b958b5a1600ce5a7059508190ee2d01f5cc84747848a7cd09745c')
 
 
 export KBUILD_BUILD_HOST=archlinux