Update v5.10 patches

Changes:
 - SAM:
   - Add support for Surface Laptop 4
     - Fix legacy PIC initialization issue
     - Add missing device IDs for GPIO controller and UARTs
   - Small code fixes

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/14bc27c69460ac0c59ec1871f16e578b221f9b51
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/0b523071593e7022477fd12eb233fa57d66e0b9e

patches/5.10/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 74fc578f59236c996e884a33d5874b6316cbc7f4 Mon Sep 17 00:00:00 2001
+From c37ba8514f05cfffad24efdabb75d1507fe05fa6 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

patches/5.10/0002-wifi.patch

@@ -1,4 +1,4 @@
-From 12d1270de8f6da102f5ca6940905db310cf21a51 Mon Sep 17 00:00:00 2001
+From 7b13567895658cc83efd2a5d9e5f763c47dfb2c3 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
@@ -206,7 +206,7 @@ index 000000000000..5326ae7e5671
 -- 
 2.31.1
 
-From 9129f8ed3e444e430a204eb42f7777f150428cf3 Mon Sep 17 00:00:00 2001
+From 5fa529603b85b254671fc9186ed0715bdbf11f76 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+
@@ -407,7 +407,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
 -- 
 2.31.1
 
-From 9c0672f40fd77923699f2394b7ae809edc35edd3 Mon Sep 17 00:00:00 2001
+From 8e91abd196a6594075f0987d0f83e618e8d3f4cc 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
@@ -586,7 +586,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
 -- 
 2.31.1
 
-From a956aa1822a9f019a24c4618f1d93e1242af8c0c Mon Sep 17 00:00:00 2001
+From b56cba0eced6127d4026d3f81202e4fa55861bf1 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
@@ -648,7 +648,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
 -- 
 2.31.1
 
-From 604b1744405e96308c54ccae487bcfcc995a3213 Mon Sep 17 00:00:00 2001
+From c420f428b2c707e0206d2e43f0eff1a0026fbfe1 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+
@@ -803,7 +803,7 @@ index 3ef7440418e3..a95ebac06e13 100644
 -- 
 2.31.1
 
-From a8ef67e6550551177f795d20170637174b8cef2f Mon Sep 17 00:00:00 2001
+From 744abac69a802df30e0a84b53f5ded8996618f31 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 10 Nov 2020 12:49:56 +0100
 Subject: [PATCH] mwifiex: Use non-posted PCI register writes
@@ -860,7 +860,7 @@ index fcedc663ccc7..5eea6cb73fb7 100644
 -- 
 2.31.1
 
-From 1530e4acedd161eed46c4a344476a859bd74977a Mon Sep 17 00:00:00 2001
+From 2ae620113185b1375445b14c48bf20e57531ffe2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 3 Nov 2020 13:28:04 +0100
 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@@ -1027,7 +1027,7 @@ index a95ebac06e13..4ec2ae72f632 100644
 -- 
 2.31.1
 
-From 5942a107a15320536869933a634f15dbf5d2d942 Mon Sep 17 00:00:00 2001
+From 40a185bec76fb6db1d0e9c06fdce26a6e62e6091 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sun, 28 Mar 2021 21:10:06 +0200
 Subject: [PATCH] mwifiex: Try waking the firmware until we get an interrupt
@@ -1116,7 +1116,7 @@ index 7dc54c446559..505a90743f2f 100644
 -- 
 2.31.1
 
-From 03d7b61add8d092baa408ee38a38ddfed7430001 Mon Sep 17 00:00:00 2001
+From e5a4f1a3b6a16807dcfa93c1ef98cb93b2b0f747 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 25 Mar 2021 11:33:02 +0100
 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
@@ -1194,7 +1194,7 @@ index 2953b96b3ced..3459ee86530c 100644
 -- 
 2.31.1
 
-From 3ae69df0622c603f7f9733b6fc6eea726c2ab719 Mon Sep 17 00:00:00 2001
+From 557ad0557872b87d3da61e942bb54f18d80bc9b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:31:26 +0100
 Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type
@@ -1295,7 +1295,7 @@ index a6b9dc6700b1..d50fd8570475 100644
 -- 
 2.31.1
 
-From cdcdefb52bf04c57b25011b69e0cc084fb09e68a Mon Sep 17 00:00:00 2001
+From 14270f6614de2ee90a7a026f8252acfe287e86b5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:44:39 +0100
 Subject: [PATCH] mwifiex: Use function to check whether interface type change
@@ -1528,7 +1528,7 @@ index d50fd8570475..3a79a55bbfd2 100644
 -- 
 2.31.1
 
-From db3e6e83d6df041a8ef7cea00b245c64a04e55ac Mon Sep 17 00:00:00 2001
+From cd57b2b65c6ae5f0e0093d19c5989d7faa235468 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 13:33:04 +0100
 Subject: [PATCH] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION
@@ -1596,7 +1596,7 @@ index 3a79a55bbfd2..66e978088061 100644
 -- 
 2.31.1
 
-From eb3ef5b8356233e1ef2a7032c0d46a118cb468c8 Mon Sep 17 00:00:00 2001
+From 0c2b557e6c7590e03c69a4bf92ce77d3a111872f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 14:42:54 +0100
 Subject: [PATCH] mwifiex: Use helper function for counting interface types
@@ -1772,7 +1772,7 @@ index 66e978088061..db30f595e9f9 100644
 -- 
 2.31.1
 
-From 164a667b811f7fcc03701023b88aa2898e80b35b Mon Sep 17 00:00:00 2001
+From 15ffe5d288443cfc4549ff7975dff0205ddc9f62 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:56:58 +0100
 Subject: [PATCH] mwifiex: Update virtual interface counters right after
@@ -1875,7 +1875,7 @@ index db30f595e9f9..60de1cec77c7 100644
 -- 
 2.31.1
 
-From 46b7333f90e1dcb0a2fb339b4b5e1a329ec38557 Mon Sep 17 00:00:00 2001
+From c034f9a424b2ece9a0678392382b9765a77b02e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 13:42:40 +0100
 Subject: [PATCH] mwifiex: Allow switching interface type from P2P_CLIENT to
@@ -1964,7 +1964,7 @@ index 60de1cec77c7..a37b504bd084 100644
 -- 
 2.31.1
 
-From a751ec37587f19ceb3bb03fa9e7637b6e932de1e Mon Sep 17 00:00:00 2001
+From 714013b51c7756d40e25f29c1bca55db1d477f2a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:31:08 +0100
 Subject: [PATCH] mwifiex: Handle interface type changes from AP to STATION
@@ -1991,7 +1991,7 @@ index a37b504bd084..e65f285e3efe 100644
 -- 
 2.31.1
 
-From 48280c2a12a3b29c3dc52b6416bff0e46496e6cd Mon Sep 17 00:00:00 2001
+From 3c73732e56f33dfc7ca9e7754f172eb6363c88d3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:32:16 +0100
 Subject: [PATCH] mwifiex: Properly initialize private structure on interface
@@ -2046,7 +2046,7 @@ index e65f285e3efe..a290312313f3 100644
 -- 
 2.31.1
 
-From 149156f12fcef3b2e5fac69f25a2bc95b44018ea Mon Sep 17 00:00:00 2001
+From 6463fea2d99a3117c3a4dbc2c282874f00143391 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sat, 27 Mar 2021 12:19:14 +0100
 Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual
@@ -2078,7 +2078,7 @@ index a290312313f3..1e1cf523e228 100644
 -- 
 2.31.1
 
-From 2d2cb1a453290d691ad700febac2c0e2e61ec339 Mon Sep 17 00:00:00 2001
+From 2a66e4764f340b828b037f973212c46b6de31b43 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 13 Apr 2021 14:30:28 +0200
 Subject: [PATCH] mwifiex: Deactive host sleep using HSCFG after it was
@@ -2234,7 +2234,7 @@ index d3a968ef21ef..76db9a7b8199 100644
 -- 
 2.31.1
 
-From fd1c64b7ed8be97f48eea2555305255f21a147c0 Mon Sep 17 00:00:00 2001
+From 2fabb775b7c1169990a346e037e6022620c79baa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 13 Apr 2021 14:23:05 +0200
 Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain
@@ -2337,7 +2337,7 @@ index 119ccacd1fcc..fb245adba19f 100644
 -- 
 2.31.1
 
-From 48b5ea876b10fbd6c28d9b76a2d704fc825506d9 Mon Sep 17 00:00:00 2001
+From f5faa00a1a60e2f60927658bb6d24c525d26d1e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 15:17:07 +0100
 Subject: [PATCH] mwifiex: Don't log error on suspend if wake-on-wlan is
@@ -2369,7 +2369,7 @@ index 1e1cf523e228..1cdd66c37cfc 100644
 -- 
 2.31.1
 
-From 26285aac1f33e63367dda516c66f297cdf710376 Mon Sep 17 00:00:00 2001
+From b8c67c6ea986cd33b9a8d65f5c502afc51c927ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sun, 28 Mar 2021 21:42:54 +0200
 Subject: [PATCH] mwifiex: Log an error on command failure during key-material
@@ -2409,7 +2409,7 @@ index 1cdd66c37cfc..6ad935c1bb47 100644
 -- 
 2.31.1
 
-From 1c6250ca3872df2621b267c9b878ca2491268c05 Mon Sep 17 00:00:00 2001
+From cbbdbfb5363d0729072cdc826911ec1df7bc364f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 13 Apr 2021 12:44:03 +0200
 Subject: [PATCH] mwifiex: Fix an incorrect comment
@@ -2437,7 +2437,7 @@ index 6696bce56178..b0695432b26a 100644
 -- 
 2.31.1
 
-From cca70037f29f7d1ff4d76e82b1a4f22a17059496 Mon Sep 17 00:00:00 2001
+From 0f4c1e68c93386ee2632a316012fef9cc6bccf83 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 13 Apr 2021 12:45:59 +0200
 Subject: [PATCH] mwifiex: Send DELBA requests according to spec
@@ -2480,7 +2480,7 @@ index b0695432b26a..9ff2058bcd7e 100644
 -- 
 2.31.1
 
-From 8b1c001669dea66e4a49514287165cee4fec9b17 Mon Sep 17 00:00:00 2001
+From d4bacd9370bb46f3ad188aeffc0b41bb1837157e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 13 Apr 2021 12:57:41 +0200
 Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware

patches/5.10/0003-ipts.patch

@@ -1,4 +1,4 @@
-From e6c903e0df9013ea940a5d4d14f20af69be23182 Mon Sep 17 00:00:00 2001
+From 0c3ab548ce610f9a5cfeae71dd65346dc7197547 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
@@ -36,7 +36,7 @@ index c3393b383e59..0098f98426c1 100644
 -- 
 2.31.1
 
-From 3d9eb2173266ada906958bc6f0f4e1828416a65c Mon Sep 17 00:00:00 2001
+From a65f86cc7df32b887f982564478ff7efec7553a7 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
@@ -65,7 +65,7 @@ index bcee77768b91..21ed765003e1 100644
 -- 
 2.31.1
 
-From 85aa0e8271c3cfc3422c0c7a7122cc25b722f074 Mon Sep 17 00:00:00 2001
+From 734279e4d78de39653549d1905776356c16ee382 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

patches/5.10/0004-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 10c561c75314ee26a3b56d46275e752fb3a01584 Mon Sep 17 00:00:00 2001
+From 8e509fd3c39790e3aedc60435978e39212a6791b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 16 Aug 2020 23:39:56 +0200
 Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface

patches/5.10/0005-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 45443df8a01e6bc1c37192758e6dc8cb51f0c758 Mon Sep 17 00:00:00 2001
+From 166166a65024b518765087d34d4251409fda6b30 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
@@ -110,7 +110,7 @@ index 37c510d9347a..aed579942436 100644
 -- 
 2.31.1
 
-From 159593ed4f42ab1185e33e99f5841714a32739b4 Mon Sep 17 00:00:00 2001
+From 3d29f1eb007a6048a949fb0d4917b64158cd8507 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 6 Sep 2020 04:01:19 +0200
 Subject: [PATCH] platform/x86: Add driver for Surface Book 1 dGPU switch

patches/5.10/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From c8c74bacbdc27b274a2b21bab82cad71837a5eb0 Mon Sep 17 00:00:00 2001
+From b27b0f0c3f32e8e3a8cebfc99b42944770834ae9 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:23:20 +0200
 Subject: [PATCH] Add file2alias support for Surface Aggregator Module devices
@@ -99,7 +99,7 @@ index 2417dd1dee33..a6c583362b92 100644
 -- 
 2.31.1
 
-From e7e9b8d8f15fbacd2bc1c7cfdc3990dd5df082b1 Mon Sep 17 00:00:00 2001
+From 565972a447ea3859d213bb0784e456e2e875a29b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:44:30 +0200
 Subject: [PATCH] platform/x86: Add support for Surface System Aggregator
@@ -129,6 +129,8 @@ Patchset: surface-sam
  .../surface_aggregator/internal.rst           |  577 ++++
  .../surface_aggregator/overview.rst           |   77 +
  .../driver-api/surface_aggregator/ssh.rst     |  344 +++
+ arch/x86/kernel/i8259.c                       |   51 +-
+ drivers/acpi/acpi_apd.c                       |    1 +
  drivers/hid/Kconfig                           |    4 +-
  drivers/hid/Makefile                          |    2 +
  drivers/hid/surface-hid/Kconfig               |   42 +
@@ -137,6 +139,7 @@ Patchset: surface-sam
  drivers/hid/surface-hid/surface_hid_core.c    |  272 ++
  drivers/hid/surface-hid/surface_hid_core.h    |   77 +
  drivers/hid/surface-hid/surface_kbd.c         |  300 ++
+ drivers/pinctrl/pinctrl-amd.c                 |    1 +
  drivers/platform/x86/Kconfig                  |  102 +
  drivers/platform/x86/Makefile                 |    7 +
  drivers/platform/x86/surface_acpi_notify.c    |  886 ++++++
@@ -163,6 +166,7 @@ Patchset: surface-sam
  drivers/power/supply/Makefile                 |    2 +
  drivers/power/supply/surface_battery.c        |  875 ++++++
  drivers/power/supply/surface_charger.c        |  282 ++
+ drivers/tty/serial/8250/8250_dw.c             |    1 +
  include/linux/mod_devicetable.h               |    5 +-
  include/linux/surface_acpi_notify.h           |   39 +
  include/linux/surface_aggregator/controller.h |  824 ++++++
@@ -172,7 +176,7 @@ Patchset: surface-sam
  include/uapi/linux/surface_aggregator/dtx.h   |  146 +
  scripts/mod/devicetable-offsets.c             |    3 +-
  scripts/mod/file2alias.c                      |   10 +-
- 55 files changed, 19198 insertions(+), 8 deletions(-)
+ 59 files changed, 19247 insertions(+), 13 deletions(-)
  create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst
  create mode 100644 Documentation/driver-api/surface_aggregator/client.rst
  create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst
@@ -2679,6 +2683,108 @@ index 000000000000..bf007d6c9873
 +(per party, effectively leading to synchronous communication regarding
 +frames) and at most three pending commands. The limit to synchronous frame
 +transfers seems to be consistent with behavior observed on Windows.
+diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
+index 282b4ee1339f..0da757c6b292 100644
+--- a/arch/x86/kernel/i8259.c
++++ b/arch/x86/kernel/i8259.c
+@@ -1,4 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
++
++#define pr_fmt(fmt) "i8259: " fmt
++
+ #include <linux/linkage.h>
+ #include <linux/errno.h>
+ #include <linux/signal.h>
+@@ -16,6 +19,7 @@
+ #include <linux/io.h>
+ #include <linux/delay.h>
+ #include <linux/pgtable.h>
++#include <linux/dmi.h>
+ 
+ #include <linux/atomic.h>
+ #include <asm/timer.h>
+@@ -298,11 +302,39 @@ static void unmask_8259A(void)
+ 	raw_spin_unlock_irqrestore(&i8259A_lock, flags);
+ }
+ 
++/*
++ * DMI table to identify devices with quirky probe behavior. See comment in
++ * probe_8259A() for more details.
++ */
++static const struct dmi_system_id retry_probe_quirk_table[] = {
++	{
++		.ident = "Microsoft Surface Laptop 4 (AMD)",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
++			DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
++		},
++	},
++	{}
++};
++
+ static int probe_8259A(void)
+ {
+ 	unsigned long flags;
+ 	unsigned char probe_val = ~(1 << PIC_CASCADE_IR);
+ 	unsigned char new_val;
++	unsigned int i, imax = 1;
++
++	/*
++	 * Some systems have a legacy PIC that doesn't immediately respond
++	 * after boot. We know it's there, we know it should respond and is
++	 * required for proper interrupt handling later on, so let's try a
++	 * couple of times.
++	 */
++	if (dmi_check_system(retry_probe_quirk_table)) {
++		pr_warn("system with broken legacy PIC detected, re-trying multiple times if necessary\n");
++		imax = 10;
++	}
++
+ 	/*
+ 	 * Check to see if we have a PIC.
+ 	 * Mask all except the cascade and read
+@@ -312,15 +344,24 @@ static int probe_8259A(void)
+ 	 */
+ 	raw_spin_lock_irqsave(&i8259A_lock, flags);
+ 
+-	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-2 */
+-	outb(probe_val, PIC_MASTER_IMR);
+-	new_val = inb(PIC_MASTER_IMR);
+-	if (new_val != probe_val) {
+-		printk(KERN_INFO "Using NULL legacy PIC\n");
++	for (i = 0; i < imax; i++) {
++		outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-2 */
++		outb(probe_val, PIC_MASTER_IMR);
++		new_val = inb(PIC_MASTER_IMR);
++		if (new_val == probe_val)
++			break;
++	}
++
++	if (i == imax) {
++		pr_info("using NULL legacy PIC\n");
+ 		legacy_pic = &null_legacy_pic;
+ 	}
+ 
+ 	raw_spin_unlock_irqrestore(&i8259A_lock, flags);
++
++	if (imax > 1 && i < imax)
++		pr_info("got legacy PIC after %d tries\n", i + 1);
++
+ 	return nr_legacy_irqs();
+ }
+ 
+diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
+index 39359ce0eb2c..645e82a66bb0 100644
+--- a/drivers/acpi/acpi_apd.c
++++ b/drivers/acpi/acpi_apd.c
+@@ -226,6 +226,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
+ 	{ "AMDI0010", APD_ADDR(wt_i2c_desc) },
+ 	{ "AMD0020", APD_ADDR(cz_uart_desc) },
+ 	{ "AMDI0020", APD_ADDR(cz_uart_desc) },
++	{ "AMDI0022", APD_ADDR(cz_uart_desc) },
+ 	{ "AMD0030", },
+ 	{ "AMD0040", APD_ADDR(fch_misc_desc)},
+ 	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },
 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
 index 9b56226ce0d1..ee04d30d6d39 100644
 --- a/drivers/hid/Kconfig
@@ -3696,6 +3802,18 @@ index 000000000000..0635341bc517
 +MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
 +MODULE_DESCRIPTION("HID legacy transport driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
+diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
+index 899c16c17b6d..ef49402c0623 100644
+--- a/drivers/pinctrl/pinctrl-amd.c
++++ b/drivers/pinctrl/pinctrl-amd.c
+@@ -952,6 +952,7 @@ static int amd_gpio_remove(struct platform_device *pdev)
+ static const struct acpi_device_id amd_gpio_acpi_match[] = {
+ 	{ "AMD0030", 0 },
+ 	{ "AMDI0030", 0},
++	{ "AMDI0031", 0},
+ 	{ },
+ };
+ MODULE_DEVICE_TABLE(acpi, amd_gpio_acpi_match);
 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
 index a9b12f4dcbd1..dbb07644c312 100644
 --- a/drivers/platform/x86/Kconfig
@@ -17246,7 +17364,7 @@ index 000000000000..5ec2e6bb2465
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
 new file mode 100644
-index 000000000000..81a5b79822c9
+index 000000000000..a060c36c7766
 --- /dev/null
 +++ b/drivers/power/supply/surface_charger.c
 @@ -0,0 +1,282 @@
@@ -17318,7 +17436,7 @@ index 000000000000..81a5b79822c9
 +
 +static int spwr_ac_update_unlocked(struct spwr_ac_device *ac)
 +{
-+	u32 old = ac->state;
++	__le32 old = ac->state;
 +	int status;
 +
 +	lockdep_assert_held(&ac->lock);
@@ -17532,6 +17650,18 @@ index 000000000000..81a5b79822c9
 +MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
 +MODULE_DESCRIPTION("AC driver for Surface System Aggregator Module");
 +MODULE_LICENSE("GPL");
+diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
+index 9e204f9b799a..a3a0154da567 100644
+--- a/drivers/tty/serial/8250/8250_dw.c
++++ b/drivers/tty/serial/8250/8250_dw.c
+@@ -714,6 +714,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = {
+ 	{ "APMC0D08", 0},
+ 	{ "AMD0020", 0 },
+ 	{ "AMDI0020", 0 },
++	{ "AMDI0022", 0 },
+ 	{ "BRCM2032", 0 },
+ 	{ "HISI0031", 0 },
+ 	{ },
 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
 index ef64063fac30..0b8f1feefe0e 100644
 --- a/include/linux/mod_devicetable.h

patches/5.10/0007-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From 00be020288d8f6f3057a59ff95ef9337a1848d3e Mon Sep 17 00:00:00 2001
+From 56cde4e895b8129f5b0b84df3ba8743423af863b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 31 Oct 2020 20:46:33 +0100
 Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
@@ -71,75 +71,7 @@ index d15c881e2e7e..b15f754e6346 100644
 -- 
 2.31.1
 
-From 5c5ac8452ced547ede9893508b8dbcd2423577b3 Mon Sep 17 00:00:00 2001
-From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
-Date: Tue, 16 Mar 2021 16:51:40 +0100
-Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags()
-
-It should not be necessary to update the current_state field of
-struct pci_dev in pci_enable_device_flags() before calling
-do_pci_enable_device() for the device, because none of the
-code between that point and the pci_set_power_state() call in
-do_pci_enable_device() invoked later depends on it.
-
-Moreover, doing that is actively harmful in some cases.  For example,
-if the given PCI device depends on an ACPI power resource whose _STA
-method initially returns 0 ("off"), but the config space of the PCI
-device is accessible and the power state retrieved from the
-PCI_PM_CTRL register is D0, the current_state field in the struct
-pci_dev representing that device will get out of sync with the
-power.state of its ACPI companion object and that will lead to
-power management issues going forward.
-
-To avoid such issues it is better to leave the current_state value
-as is until it is changed to PCI_D0 by do_pci_enable_device() as
-appropriate.  However, the power state of the device is not changed
-to PCI_D0 if it is already enabled when pci_enable_device_flags()
-gets called for it, so update its current_state in that case, but
-use pci_update_current_state() covering platform PM too for that.
-
-Link: https://lore.kernel.org/lkml/20210314000439.3138941-1-luzmaximilian@gmail.com/
-Reported-by: Maximilian Luz <luzmaximilian@gmail.com>
-Tested-by: Maximilian Luz <luzmaximilian@gmail.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Patchset: surface-hotplug
----
- drivers/pci/pci.c | 16 +++-------------
- 1 file changed, 3 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 9e971fffeb6a..d5d9ea864fe6 100644
---- a/drivers/pci/pci.c
-+++ b/drivers/pci/pci.c
-@@ -1874,20 +1874,10 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
- 	int err;
- 	int i, bars = 0;
- 
--	/*
--	 * Power state could be unknown at this point, either due to a fresh
--	 * boot or a device removal call.  So get the current power state
--	 * so that things like MSI message writing will behave as expected
--	 * (e.g. if the device really is in D0 at enable time).
--	 */
--	if (dev->pm_cap) {
--		u16 pmcsr;
--		pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
--		dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
--	}
--
--	if (atomic_inc_return(&dev->enable_cnt) > 1)
-+	if (atomic_inc_return(&dev->enable_cnt) > 1) {
-+		pci_update_current_state(dev, dev->current_state);
- 		return 0;		/* already enabled */
-+	}
- 
- 	bridge = pci_upstream_bridge(dev);
- 	if (bridge)
--- 
-2.31.1
-
-From b412e82807d67368d38654aafd32d56e3720c4b7 Mon Sep 17 00:00:00 2001
+From 8d0ad54c108e1145dd92db0d1e573496eae37663 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 14 Dec 2020 20:50:59 +0100
 Subject: [PATCH] platform/x86: Add Surface Hotplug driver

patches/5.10/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 9615e9691fa9da0bc625dfdb5631dfcade846d07 Mon Sep 17 00:00:00 2001
+From d91407a67e8eaea524a6f3a656a48139bec5b70a 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

patches/5.10/0009-surface-sensors.patch

@@ -1,4 +1,4 @@
-From 2d54e6ccb89225e8247ba084d83f6e941fd29836 Mon Sep 17 00:00:00 2001
+From 34897c807a355287e337147706b6ae5de5b7b621 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

patches/5.10/0010-cameras.patch

@@ -1,4 +1,4 @@
-From 7c74c767a4b74f801bc2b283e84aef02f9aca9a6 Mon Sep 17 00:00:00 2001
+From 5d255f21684d0cfac361828f0052edf074b2e9c3 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@linux.intel.com>
 Date: Mon, 12 Oct 2020 21:04:11 +0300
 Subject: [PATCH] ipu3-cio2: Use unsigned values where appropriate
@@ -316,7 +316,7 @@ index 146492383aa5..7650d7998a3f 100644
 -- 
 2.31.1
 
-From 929a2ffeafb59ded7e7a9211c5fbce78204a1609 Mon Sep 17 00:00:00 2001
+From deb381c6e47e6c9ba9d06863839320bf083af9d1 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@linux.intel.com>
 Date: Mon, 12 Oct 2020 21:04:12 +0300
 Subject: [PATCH] ipu3-cio2: Remove explicit type from frame size checks
@@ -350,7 +350,7 @@ index dcbfe8c9abc7..a1f574095acc 100644
 -- 
 2.31.1
 
-From e3d768c25ce3020fac64692ef6f33a26e085cd51 Mon Sep 17 00:00:00 2001
+From 029c1760325ba6ee6f09a447e2d1fc744b4ee6bf Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@linux.intel.com>
 Date: Mon, 12 Oct 2020 21:04:13 +0300
 Subject: [PATCH] ipu3-cio2: Rename CIO2_IMAGE_MAX_LENGTH as
@@ -409,7 +409,7 @@ index 7650d7998a3f..ccf0b85ae36f 100644
 -- 
 2.31.1
 
-From 600e15b2927e7099ceeae93427bf8964bc0a7e3a Mon Sep 17 00:00:00 2001
+From 4c149b9db74ac9a650b0421e89f25adccc31fc77 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
 Date: Tue, 13 Oct 2020 17:25:35 +0300
 Subject: [PATCH] ipu3-cio2: Check receved the size against payload size, not
@@ -463,7 +463,7 @@ index 93fd25a5a3e9..b244b9de142a 100644
 -- 
 2.31.1
 
-From 644d554fab684284102140fdd98b639f55d1562e Mon Sep 17 00:00:00 2001
+From a6895c3dcc457ce0101b8e201e1c7049e021d2b1 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
@@ -515,7 +515,7 @@ index ccf0b85ae36f..62187ab5ae43 100644
 -- 
 2.31.1
 
-From 275cc95c08ececab19ca8ed9ca221038ccd7d331 Mon Sep 17 00:00:00 2001
+From 9aee9e020b500110ee0a86a97e720ca1ce337243 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
@@ -560,7 +560,7 @@ index 4c43d30145c6..bc9c634df6df 100644
 -- 
 2.31.1
 
-From 1f5487f982534a9a6a3ab0d2fb132b544dff4ff7 Mon Sep 17 00:00:00 2001
+From b056d2e0dc3350c27d702fd32a127d408eb2e4a3 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
@@ -604,7 +604,7 @@ index bc9c634df6df..ddba75d90af2 100644
 -- 
 2.31.1
 
-From 755a1392936f33ea6f062bedd5b287a17be87154 Mon Sep 17 00:00:00 2001
+From 395e0a70999244a9c30a51b6378af976033163e5 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
@@ -707,7 +707,7 @@ index 206bd4d7d7e2..eb89bdb9232c 100644
 -- 
 2.31.1
 
-From 6365d85c962dc3a9185cecdb3a55cf3bea27de67 Mon Sep 17 00:00:00 2001
+From 03c94b332b48305c64d3bd553b3f498e79925063 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
@@ -762,7 +762,7 @@ index eb89bdb9232c..032b24f60c78 100644
 -- 
 2.31.1
 
-From 342be6e43cb8a981ef4e0d77fb36b7bfa86ca0df Mon Sep 17 00:00:00 2001
+From d5539045fc0e78c7ef33567a742fb5dc79feefbf 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
@@ -803,7 +803,7 @@ index 9506f8ec0974..72d36d46287d 100644
 -- 
 2.31.1
 
-From c78dc2864837a1cdb95467afda680c7c72915967 Mon Sep 17 00:00:00 2001
+From b220186984d2c19995b3678183cea565c2ffdc75 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
@@ -971,7 +971,7 @@ index 032b24f60c78..7f056c5e0ed3 100644
 -- 
 2.31.1
 
-From aa916703bd6155574e11b94ae80c1ef2da797728 Mon Sep 17 00:00:00 2001
+From e82ac02f1fdf49936bccb7e4a9fe3d3ef052dd8a 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
@@ -1009,7 +1009,7 @@ index 7ac87f18a10f..7d60f24240a4 100644
 -- 
 2.31.1
 
-From a70d4aef14938791ecc817928a070c4b8f9bab1f Mon Sep 17 00:00:00 2001
+From 2758229edf502e8f1796bd5c48ee6c1f322eccd8 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
@@ -1040,7 +1040,7 @@ index 24cdfcf334ea..d15fa5b4558a 100644
 -- 
 2.31.1
 
-From 90d80417aed43cace9b4397b2d9588dbea3182a9 Mon Sep 17 00:00:00 2001
+From d44fe5febe4f2b79fb205a5e0350b227b93290d4 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
@@ -1075,7 +1075,7 @@ rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 -- 
 2.31.1
 
-From 73bbb53d1d3f451c5af6ca7c84e6c48cf222f919 Mon Sep 17 00:00:00 2001
+From d4ab87ba2faf8b515e33e8c5ee4c26bdda11596c 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
@@ -1116,7 +1116,7 @@ index e3ab003a6c85..9dd896d085ec 100644
 -- 
 2.31.1
 
-From 86f3eee6517363ea087020584bdf0c915281a54b Mon Sep 17 00:00:00 2001
+From 7e7249f0a1325b7e150bb467b63b49c6fdc4f41b 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
@@ -1225,7 +1225,7 @@ index 37dac195adbb..f28b097c658f 100644
 -- 
 2.31.1
 
-From 3244bd5c49d370a188a39ffcf42d94711acb1483 Mon Sep 17 00:00:00 2001
+From 4798b25e49480832d48d57d444e1fca2fbc1b032 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
@@ -1302,7 +1302,7 @@ index ed0840f3d5df..6ca337c28b3c 100644
 -- 
 2.31.1
 
-From 87e12748d0887979241bd90aea53c8fc49588f1a Mon Sep 17 00:00:00 2001
+From 0d1b0fe37689bce5e513f9f852c6f5f30625a60f 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
@@ -1900,7 +1900,7 @@ index 62187ab5ae43..dc3e343a37fb 100644
 -- 
 2.31.1
 
-From 0a62cf0628d0d993848903935d6a919712fd851f Mon Sep 17 00:00:00 2001
+From b620c6839820be6b048825451b68a80bb273c5f8 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
@@ -2002,7 +2002,7 @@ index ddca1550cce6..78b38775f18b 100644
 -- 
 2.31.1
 
-From 6ca9d64a0bad3e88e17f53d48f2f555b9b10098a Mon Sep 17 00:00:00 2001
+From ac692b2a61b3bd51fb2366911c2b707cdafdd600 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
@@ -2088,7 +2088,7 @@ index f28b097c658f..9bec3373f850 100644
 -- 
 2.31.1
 
-From 80cce6c417d6ca8a0217383d36de4d77f7c154ce Mon Sep 17 00:00:00 2001
+From 21208edb670f57e86c194db932f57df3e3336050 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()
@@ -2156,7 +2156,7 @@ index 56622658b215..65acae61dc5c 100644
 -- 
 2.31.1
 
-From edd879804a6209f7d6e366fa26b32a716657d982 Mon Sep 17 00:00:00 2001
+From 3c6fe59efbec75565471655146bf155e17f33497 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()
@@ -2214,7 +2214,7 @@ index 65acae61dc5c..b82aac05b17f 100644
 -- 
 2.31.1
 
-From da79b55172275043be7589fc54b0233d37d10986 Mon Sep 17 00:00:00 2001
+From 9e107b1129988e5acf7571c6883c278527c8441c 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()
@@ -2278,7 +2278,7 @@ index fdb1d5262ce8..817f53506cfe 100644
 -- 
 2.31.1
 
-From 067fba193bbd42635071b0e59f7412aefdbc91d3 Mon Sep 17 00:00:00 2001
+From 31ec5f1e7f4b6b9d6fbfb53ca2add4e5698f4528 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
@@ -2469,7 +2469,7 @@ index 4a4df4ffd18c..000000000000
 -- 
 2.31.1
 
-From e359c36a6f7ff5df0f64c28aaf5c6c9aa5809a36 Mon Sep 17 00:00:00 2001
+From 6a7551efd24ea568fdabf949094b64edd0d202cd 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
@@ -3438,7 +3438,7 @@ index 000000000000..3fe27ec0caff
 -- 
 2.31.1
 
-From 53cbd912c6f1c34a4be214ec9d0da64ff2e1a488 Mon Sep 17 00:00:00 2001
+From d16e62943c7d82e743d86eb530a133f8254e5c50 Mon Sep 17 00:00:00 2001
 From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 Date: Fri, 11 Dec 2020 21:17:35 +0100
 Subject: [PATCH] PCI: ACPI: Fix up ACPI companion lookup for device 0 on the
@@ -3508,7 +3508,7 @@ index 745a4e0c4994..87e45a800919 100644
 -- 
 2.31.1
 
-From e540fb9bb9e04dfab1b37dad940ce65a58ae03b4 Mon Sep 17 00:00:00 2001
+From c535ed24d096ba32507893c3cdb9dd56390245dc 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
@@ -6865,7 +6865,7 @@ index 000000000000..9a508e1f3624
 -- 
 2.31.1
 
-From d6b23c2531f82d8113a2b181594437fcb476d34f Mon Sep 17 00:00:00 2001
+From afb0702b6ff902357e720a0e8f40517d6fcee722 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
@@ -6906,7 +6906,7 @@ index 32485e4ed42b..f9ced52ad37a 100644
 -- 
 2.31.1
 
-From 05ec620f745c01476678e3a254c65d9cf138a237 Mon Sep 17 00:00:00 2001
+From de2bf86be549c40281c6f8f9b73c878325a3c3e5 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
@@ -6935,7 +6935,7 @@ index f9ced52ad37a..9fd44a3d1d85 100644
 -- 
 2.31.1
 
-From 8f24b839c274128f6f31aba5729e475cb7d7925b Mon Sep 17 00:00:00 2001
+From 0c04ce18fed49e009af2dc305c723295dd99d0af 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
@@ -7098,7 +7098,7 @@ index dd0ffcafa489..924d99d20328 100644
 -- 
 2.31.1
 
-From c8b0263611dfe58bb0c5a25928c08256eb00b964 Mon Sep 17 00:00:00 2001
+From b55dc925e7599f3831ce7705e98cb86a0d9cc1b2 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
@@ -7154,7 +7154,7 @@ index 9fd44a3d1d85..1a85800df7ed 100644
 -- 
 2.31.1
 
-From 9c0388dfb499f10adfcd92fb4d70c7a64ca3e771 Mon Sep 17 00:00:00 2001
+From 8ecb611e6e3fbbc5f472bbc7ecc72571aca75dac 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
@@ -7571,7 +7571,7 @@ index 3fe27ec0caff..40629291b339 100644
 -- 
 2.31.1
 
-From f316f4e86d43762864937435de31a89ea2d6bbce Mon Sep 17 00:00:00 2001
+From f4e4284ddc17fc51066713de5c552df9cfef7991 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
@@ -7698,7 +7698,7 @@ index 42ae8396eb64..98eb1ec3399e 100644
 -- 
 2.31.1
 
-From 24e98d89000e1d12da1e0afd387976530ac61046 Mon Sep 17 00:00:00 2001
+From 2bd9779d9bb42517fef30a657cca0ac709cbd072 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
@@ -7802,7 +7802,7 @@ index 924d99d20328..e1e388cc9f45 100644
 -- 
 2.31.1
 
-From 5e083e40013e31f42fcc32105af1258b96b6c773 Mon Sep 17 00:00:00 2001
+From 1eade92b9419dda3326a989179c653cf53c79c7a 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()
@@ -7924,7 +7924,7 @@ index 9a508e1f3624..26819cf3f4d2 100644
 -- 
 2.31.1
 
-From 04a1a7cebc88a0a0edc1f639977066166872ee7a Mon Sep 17 00:00:00 2001
+From 47afabe08074245f81bd5c2f15f4d97687ea8cac 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
@@ -7962,7 +7962,7 @@ index a9747ab783d7..7fb368eec327 100644
 -- 
 2.31.1
 
-From ec4e9e4556086a5a9be966b520c8b067d55f595e Mon Sep 17 00:00:00 2001
+From d1f3a2d20c7201b7894060f122f1c1bfb9a2fefd 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
@@ -8038,7 +8038,7 @@ index 26819cf3f4d2..9d7eed97963b 100644
 -- 
 2.31.1
 
-From 176d78d3b066dbac2eb2c4e7def6d25747bee6a5 Mon Sep 17 00:00:00 2001
+From 4f309fb50fbe3405cedefd72cb42f48366858270 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
@@ -8113,7 +8113,7 @@ index 1950d7ac2d54..cea767230aa9 100644
 -- 
 2.31.1
 
-From 0aa24398833fe7f9e0653c2d978886d56475df4a Mon Sep 17 00:00:00 2001
+From 7ed7c2d3efbd06ab363e6f253a1935b13371771d 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
@@ -8149,7 +8149,7 @@ index cea767230aa9..f681dbfcec56 100644
 -- 
 2.31.1
 
-From a818e60b4708c2f5ee7934ec3ef2d722d271e013 Mon Sep 17 00:00:00 2001
+From 8ae9eef55fbc2e7bf6e1b6cd583140d45abf8179 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
@@ -8299,7 +8299,7 @@ index 9d7eed97963b..965208078c2b 100644
 -- 
 2.31.1
 
-From 82a0c50b95789701519956368b1fb8f50d2057b4 Mon Sep 17 00:00:00 2001
+From 50bed3281a3e98b5539182f16f6fc12d9ec2b18e 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
@@ -8371,7 +8371,7 @@ index f681dbfcec56..51eb3b05d121 100644
 -- 
 2.31.1
 
-From f0a8810d8b7927c8b9ad5b9a9625bc83e828edf8 Mon Sep 17 00:00:00 2001
+From 5159ec28fcc7dded1977065cfd0d062e57156b95 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
@@ -8434,7 +8434,7 @@ index 51eb3b05d121..952558c4f33b 100644
 -- 
 2.31.1
 
-From a80b6dd55f8069ddf9cb3de4290ef13a3cee0c97 Mon Sep 17 00:00:00 2001
+From a29d9a3ebb4da87a7bd70c2c323f81765031af16 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
@@ -8469,7 +8469,7 @@ index 952558c4f33b..dd31083eeb7b 100644
 -- 
 2.31.1
 
-From 4e0394ddc7e69e6c9aacc8bf05f4848ac059d228 Mon Sep 17 00:00:00 2001
+From 5d4ff5efb4597448a71210fcf465579e32c812b7 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
@@ -8508,7 +8508,7 @@ index 965208078c2b..7f1d31a82d3d 100644
 -- 
 2.31.1
 
-From 100a8cb15eeb0598da28f09d40103c054a826b20 Mon Sep 17 00:00:00 2001
+From 2f14c8a3a6cf3c9925aaf8232008b5062795867c 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
@@ -9429,7 +9429,7 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644
 -- 
 2.31.1
 
-From 81c1e332cbef88696b39fb860403aabf051aadc2 Mon Sep 17 00:00:00 2001
+From a1cb4684aecfb7b17cb489b426e7eca2af661c77 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
@@ -9774,7 +9774,7 @@ index 70ccb3aae4c7..b78d3b474a43 100644
 -- 
 2.31.1
 
-From ff6ecf5c42baa7f8e5bec61cecf998e8bf0a44eb Mon Sep 17 00:00:00 2001
+From 064aa7496478d90263ac347706edd85b93f62930 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
@@ -9945,7 +9945,7 @@ index f2eaa5f71a31..ce26ce86fbd5 100644
 -- 
 2.31.1
 
-From 9d45ec1a52bc142a07b77bdd240b011b0ef285c5 Mon Sep 17 00:00:00 2001
+From 672315fa714df89119660a7c43689b34e204d735 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
@@ -9986,7 +9986,7 @@ index ce26ce86fbd5..b3b391a49fdb 100644
 -- 
 2.31.1
 
-From 5b8eec805d07c67938f0f660965c63d771b978d0 Mon Sep 17 00:00:00 2001
+From d4f2dd69d0bf5af8e24e7347a920aa12a39ee996 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
@@ -10405,7 +10405,7 @@ index b3b391a49fdb..2c82b6578de9 100644
 -- 
 2.31.1
 
-From 14513a30b56eef0b49f92b73547de78c65438ecb Mon Sep 17 00:00:00 2001
+From 25a5941ef09083d53fe4335c9e695cf3aa71f8d0 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
@@ -10561,7 +10561,7 @@ index 2c82b6578de9..313bc9177328 100644
 -- 
 2.31.1
 
-From dc883689a71f6776f69ce308f28c9f90095eac19 Mon Sep 17 00:00:00 2001
+From 2e2faf799583b59e3e4aa1e0489181b0b9bc2eef 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
@@ -10707,7 +10707,7 @@ index b78d3b474a43..6502777eb5f3 100644
 -- 
 2.31.1
 
-From 7b385b6cc5fdfbc1a3bbe3c1cbb055d5ca371e93 Mon Sep 17 00:00:00 2001
+From c1091c8ae0195ff3b8749dccc7326f10f1a5367f 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
@@ -10737,7 +10737,7 @@ index 313bc9177328..d092ed698eb3 100644
 -- 
 2.31.1
 
-From b58b8806a0d99d83d50a1f9e2ac4650b52b11af9 Mon Sep 17 00:00:00 2001
+From 05c3b136cdbc03374a986b8fc822b72326a0740b 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
@@ -10794,7 +10794,7 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644
 -- 
 2.31.1
 
-From 0c090bb22ebab445c5f6a0e26f8fbeac15966284 Mon Sep 17 00:00:00 2001
+From 81f355329983e26193c168a412081295b0017d63 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
@@ -10868,7 +10868,7 @@ index 8082d37841da..c580159079d2 100644
 -- 
 2.31.1
 
-From 64d40bedc77d664e33e380342fc30f3ea0e26718 Mon Sep 17 00:00:00 2001
+From 8ae4a0e329bf652a5f51db5dad67965ff139a4fa 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
@@ -10911,7 +10911,7 @@ index c580159079d2..9f61b470f8ba 100644
 -- 
 2.31.1
 
-From 695c7c75156e65a1e68874da3018807c31d9b753 Mon Sep 17 00:00:00 2001
+From 15ce48f34f3307b755bea0be5c61115220e0e634 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
@@ -10990,7 +10990,7 @@ index 9f61b470f8ba..622a7ddf4063 100644
 -- 
 2.31.1
 
-From 33b753411046d83b4a21a1640e897811750e020d Mon Sep 17 00:00:00 2001
+From 5d9062246ef067bf5499f9e030f7ac10918b5e66 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
@@ -11419,7 +11419,7 @@ index 0dfbbe9a0ff2..29e6735112da 100644
 -- 
 2.31.1
 
-From 0a8c91405e88c3c6270319774c5a5fe81e7b487f Mon Sep 17 00:00:00 2001
+From 51a723afed46d9bc7cfb5fcbf408452aab4cc6e1 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

patches/5.10/0011-ath10k-firmware-override.patch

@@ -1,4 +1,4 @@
-From 8120aa74f4d7885b16e370a5c3ba0a87fcf77b5e Mon Sep 17 00:00:00 2001
+From 88c5e54881176c1826043fe5ba9b00ef71929625 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