Update v5.10 patches

Changes: - Rebase onto v5.10.65 Links: - kernel: 459bd42a63
2021-09-15 15:53:19 +02:00 · 2021-09-15 15:53:19 +02:00 · 05dbcc0783
parent 45540b9fab
commit 05dbcc0783
12 changed files with 201 additions and 201 deletions
--- a/patches/5.10/0001-surface3-oemb.patch
+++ b/patches/5.10/0001-surface3-oemb.patch
@ -1,4 +1,4 @@
-From c56681e39c0ce9e97054162007bdf3ac7c9da6e0 Mon Sep 17 00:00:00 2001
+From d3f568198a632bc78dc14689a464fbef125635f2 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.32.0
+2.33.0

--- a/patches/5.10/0002-wifi.patch
+++ b/patches/5.10/0002-wifi.patch
@ -1,4 +1,4 @@
-From 4ed45966eb9b708781dfdb75a4d3a909f9a45177 Mon Sep 17 00:00:00 2001
+From 350c19b9da6e34cab18807600ec0b054318a3679 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.32.0
+2.33.0

-From f534eca534e58d8c70718d43675d26433d9b4a67 Mon Sep 17 00:00:00 2001
+From 621afc6cca29939a47183e9521f730d6838697ec 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.32.0
+2.33.0

-From 77fbd026cc81f5b7cbade9568e428c4a1cf224c9 Mon Sep 17 00:00:00 2001
+From 8a42ba8f955b65f840c42fc2768c813b67620be7 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.32.0
+2.33.0

-From fc8c5f3a09fff4cc4b0d38b7dc1f8396f892ca04 Mon Sep 17 00:00:00 2001
+From 412abcbcf44647d6c76af4df4cba6c6579162913 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.32.0
+2.33.0

-From 8f694d37add24c9285f92cb882125002d1d94910 Mon Sep 17 00:00:00 2001
+From 1115995734b188833f983681f89c65ab066e0b20 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+
@ -801,9 +801,9 @@ index 3ef7440418e3..a95ebac06e13 100644
 void mwifiex_initialize_quirks(struct pcie_service_card *card);
 int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.32.0
+2.33.0

-From db7937af5873bf299f3ee66abf35365656eef2a0 Mon Sep 17 00:00:00 2001
+From 523c02756eab985b1c3138b3d6891863d659bf16 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
@ -858,9 +858,9 @@ index 0627a37deac8..95a0c436bc1c 100644
 }
 
 -- 
-2.32.0
+2.33.0

-From fdb27e4fa4feb1a596c87769c88ff6ab0feb68c4 Mon Sep 17 00:00:00 2001
+From 6a275955ab3dadf0a25d5e1a4d864b1dab8c6be8 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
@ -1025,9 +1025,9 @@ index a95ebac06e13..4ec2ae72f632 100644
 void mwifiex_initialize_quirks(struct pcie_service_card *card);
 int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.32.0
+2.33.0

-From 88a292e0469b0932278a13a68c1aba6633ff2802 Mon Sep 17 00:00:00 2001
+From 2f8979b6b8ebb61366ad2db345d5b0c555026c14 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
@ -1114,9 +1114,9 @@ index 97e7787e88b0..a4713019b226 100644
 	if (reg->sleep_cookie) {
 		mwifiex_pcie_dev_wakeup_delay(adapter);
 -- 
-2.32.0
+2.33.0

-From 3740a161441374ab3b2aa0d8e1ca17c9b0db0dfb Mon Sep 17 00:00:00 2001
+From fce466596c13bb3ae12d6a0a237cebb5062e4136 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
@ -1152,7 +1152,7 @@ Patchset: wifi
 1 file changed, 15 insertions(+)

 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index afd2b1f12d49..5121ba03f6a8 100644
+index e0859f4e2807..a6a3298c0178 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
@@ -60,6 +60,7 @@ static struct usb_driver btusb_driver;
@ -1171,7 +1171,7 @@ index afd2b1f12d49..5121ba03f6a8 100644
 
 	/* Intel Bluetooth devices */
 	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW |
-@@ -4110,6 +4112,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -4115,6 +4117,19 @@ static int btusb_probe(struct usb_interface *intf,
 	if (id->driver_info & BTUSB_MARVELL)
 		hdev->set_bdaddr = btusb_set_bdaddr_marvell;
 
@ -1192,9 +1192,9 @@ index afd2b1f12d49..5121ba03f6a8 100644
 	    (id->driver_info & BTUSB_MEDIATEK)) {
 		hdev->setup = btusb_mtk_setup;
 -- 
-2.32.0
+2.33.0

-From 3210f70b0cabe235163d8ef262c5791e78d0626a Mon Sep 17 00:00:00 2001
+From a04f3525d31c7e3586db04431a292759ebffe286 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
@ -1293,9 +1293,9 @@ index a6b9dc6700b1..d50fd8570475 100644
 			mwifiex_dbg(priv->adapter, ERROR,
 				    "%s: changing to %d not supported\n",
 -- 
-2.32.0
+2.33.0

-From b3baab59e5a04b1c12c29bf463739d34d84387bd Mon Sep 17 00:00:00 2001
+From 089f925b8cc5cfee676d300608d103e167ee7e72 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
@ -1526,9 +1526,9 @@ index d50fd8570475..3a79a55bbfd2 100644
 
 static void
 -- 
-2.32.0
+2.33.0

-From becb81f977fcd3913c2788c1041bc9136ab2cc4b Mon Sep 17 00:00:00 2001
+From 9b662ccd5ac174fb024517b94eb96fdd5e394d75 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
@ -1594,9 +1594,9 @@ index 3a79a55bbfd2..66e978088061 100644
 							params);
 		default:
 -- 
-2.32.0
+2.33.0

-From d771c705fb58104e785b1315a61c47a9d1fcff71 Mon Sep 17 00:00:00 2001
+From a47d4ee50a299ad98e99682cfcd04ed5f472883d 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
@ -1770,9 +1770,9 @@ index 66e978088061..db30f595e9f9 100644
 	priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
 
 -- 
-2.32.0
+2.33.0

-From c240c8e605b857f662bbd66e152b59fc78b4ae48 Mon Sep 17 00:00:00 2001
+From 8e6fa80bc59043f9481bd69c8a6fd4c709ec3176 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
@ -1873,9 +1873,9 @@ index db30f595e9f9..60de1cec77c7 100644
 }
 /*
 -- 
-2.32.0
+2.33.0

-From fac9a7d7332ad747db64ec4e252ed388053ebc3c Mon Sep 17 00:00:00 2001
+From a8c27b3dbf3045b73ec06529abfcd2db6d4e8d03 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
@ -1962,9 +1962,9 @@ index 60de1cec77c7..a37b504bd084 100644
 			return mwifiex_change_vif_to_ap(dev, curr_iftype, type,
 							params);
 -- 
-2.32.0
+2.33.0

-From 5c0e21da1ecbd5f93304ac59226743a77107f0df Mon Sep 17 00:00:00 2001
+From 8cba230c0b9a6b16600ef463838e076dd6cd0194 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
@ -1989,9 +1989,9 @@ index a37b504bd084..e65f285e3efe 100644
 							       type, params);
 			break;
 -- 
-2.32.0
+2.33.0

-From 6807923dc9c3caaad10476c511b855a3840810d2 Mon Sep 17 00:00:00 2001
+From cf30540d1421b53e2afae83ee8b0014a83a4f4b5 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
@ -2044,9 +2044,9 @@ index e65f285e3efe..a290312313f3 100644
 	default:
 		mwifiex_dbg(adapter, ERROR,
 -- 
-2.32.0
+2.33.0

-From 75349c74a1d497e2f7d2197a9d9208541b9b1fdc Mon Sep 17 00:00:00 2001
+From 608c9fb74659ae9e6d1914deee8724feed32ee7f 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
@ -2076,9 +2076,9 @@ index a290312313f3..1e1cf523e228 100644
 		priv->bss_started = 0;
 
 -- 
-2.32.0
+2.33.0

-From 359692c6738e4f82f57db8bfdfd75f04fc7593d9 Mon Sep 17 00:00:00 2001
+From 824c8443c7a7d00e9721df64394875a2c8183c46 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
@ -2232,9 +2232,9 @@ index d3a968ef21ef..76db9a7b8199 100644
 		hs_cfg->action = cpu_to_le16(HS_CONFIGURE);
 		hs_cfg->params.hs_config.conditions = hscfg_param->conditions;
 -- 
-2.32.0
+2.33.0

-From 38270a06c069f91751d8d502056b7969b2f764f5 Mon Sep 17 00:00:00 2001
+From fae48f06d4eba081504f44bfa8dd20c4c1e52fce 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
@ -2335,9 +2335,9 @@ index 119ccacd1fcc..fb245adba19f 100644
 		version_ext->version_str_sel = ver_ext->version_str_sel;
 		memcpy(version_ext->version_str, ver_ext->version_str,
 -- 
-2.32.0
+2.33.0

-From 6ee315eb40ce86f3f04a9aaa095870ac4ed7529e Mon Sep 17 00:00:00 2001
+From b2c60f6447ba0ef40651b3a861fd8edb9f056c38 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
@ -2367,9 +2367,9 @@ index 1e1cf523e228..1cdd66c37cfc 100644
 		ret = 0;
 		goto done;
 -- 
-2.32.0
+2.33.0

-From 563a26d76b78fc4a5d9259f58a7778fcd464cc82 Mon Sep 17 00:00:00 2001
+From a0f3fe40368347157d02c6804a8f499feaf55b9e 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
@ -2407,9 +2407,9 @@ index 1cdd66c37cfc..6ad935c1bb47 100644
 
 /*
 -- 
-2.32.0
+2.33.0

-From fd10dab64d743e30cab630ae9f44d239300d6855 Mon Sep 17 00:00:00 2001
+From 7b9e98f08ef31e8f31b46bca1160ba003be6dd8f 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
@ -2435,9 +2435,9 @@ index 6696bce56178..b0695432b26a 100644
 		if (!INITIATOR_BIT(del_ba_param_set))
 			return 0;
 -- 
-2.32.0
+2.33.0

-From ba8f808e36567efd934d5daf1b2501206e0bf5e4 Mon Sep 17 00:00:00 2001
+From df7bda01feb739b4e0076b1d2ea4f9f0aebf6f4c 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
@ -2478,9 +2478,9 @@ index b0695432b26a..9ff2058bcd7e 100644
 
 	/* We don't wait for the response of this command */
 -- 
-2.32.0
+2.33.0

-From c74e3de81293eec5fea24257793dbd4c72f3425d Mon Sep 17 00:00:00 2001
+From fc9a44813514992c0428231c65e7055cd33ba6a5 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
@ -2516,5 +2516,5 @@ index bc79ca4cb803..5e9e67d97857 100644
 	case EVENT_RXBA_SYNC:
 		dev_dbg(adapter->dev, "EVENT: RXBA_SYNC\n");
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0003-ipts.patch
+++ b/patches/5.10/0003-ipts.patch
@ -1,4 +1,4 @@
-From 3c9fcf71425b3f7d3942bcde8f8f046ef70435d0 Mon Sep 17 00:00:00 2001
+From 387d86d89c025d203fe00f34b3950a21f7e56ee7 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 c3393b383e59..0098f98426c1 100644
 	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)},
 -- 
-2.32.0
+2.33.0

-From 7d00fed8fe6d39fd8bbfdea2b024c4f2c45357a9 Mon Sep 17 00:00:00 2001
+From d802995e4ceb341152e79d6d8d1d0e453becf4f0 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.32.0
+2.33.0

-From da67b9b1ca5616f52ad350bb9ab10a5448dac10d Mon Sep 17 00:00:00 2001
+From 4f65f0975ecb44c038fab75e36aedb119f6dd9c0 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.32.0
+2.33.0

--- a/patches/5.10/0004-surface-gpe.patch
+++ b/patches/5.10/0004-surface-gpe.patch
@ -1,4 +1,4 @@
-From 576f8aa174315a5b1ea9bc8f59b8c92634f7350b Mon Sep 17 00:00:00 2001
+From 8e6fb321404d99f4c2dcc0b21a98275594c3624a 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
@ -397,5 +397,5 @@ index 000000000000..86f6991b1215
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurface*:*");
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0005-surface-sam-over-hid.patch
+++ b/patches/5.10/0005-surface-sam-over-hid.patch
@ -1,4 +1,4 @@
-From e3e0480f0bc9111875738bd68e5fd0c040013301 Mon Sep 17 00:00:00 2001
+From 2ee4c20507f4238d394ef9dfb6d74c846d0040b3 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.32.0
+2.33.0

-From 40bd4bd487288bc62f5d1ac04edb4c75a63ac070 Mon Sep 17 00:00:00 2001
+From a6efa0976c1112199ab5f3bb9fc407cbe51a838d 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
@ -331,5 +331,5 @@ index 000000000000..8c66ed5110fd
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0006-surface-sam.patch
+++ b/patches/5.10/0006-surface-sam.patch
@ -1,4 +1,4 @@
-From 615f3487f77f4399d45a8a53c03f63df49abbbfc Mon Sep 17 00:00:00 2001
+From 4979e92d98c33c900123ff3dc7e9c3c2c56bc474 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
@ -97,9 +97,9 @@ index 2417dd1dee33..a6c583362b92 100644
 
 /* Create MODULE_ALIAS() statements.
 -- 
-2.32.0
+2.33.0

-From d76850b09c6e7991b74e731427ef26acd8ff9aba Mon Sep 17 00:00:00 2001
+From 8790dbb38e095786c96a7e712df4a5bb6016cc06 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
@ -20754,5 +20754,5 @@ index a6c583362b92..5b79fdc42641 100644
 	ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function);
 
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0007-surface-hotplug.patch
+++ b/patches/5.10/0007-surface-hotplug.patch
@ -1,4 +1,4 @@
-From 3ab458e8e9996a3cc1a9a948c63ad828502fad68 Mon Sep 17 00:00:00 2001
+From 97440fe8ee8d0684a7a70730c2fd3a2c6b599782 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
@ -69,9 +69,9 @@ index d15c881e2e7e..b15f754e6346 100644
 	&dev_attr_vendor.attr,
 	&dev_attr_device.attr,
 -- 
-2.32.0
+2.33.0

-From a4f4bf38edf10b2070686846f32d1126e2b42b7b Mon Sep 17 00:00:00 2001
+From 102f39329cdc1c1406f7e4b5af0c6e2ab41bbec6 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
@ -422,9 +422,9 @@ index 000000000000..cfcc15cfbacb
 +MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
 +MODULE_LICENSE("GPL");
 -- 
-2.32.0
+2.33.0

-From 7fba460fdca8458c83a17abd836edb9ed61e96d1 Mon Sep 17 00:00:00 2001
+From bef4ddf21e3f95ce5b07a92837ece953fc0516b0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Jul 2021 14:35:43 +0200
 Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in
@ -438,7 +438,7 @@ Patchset: surface-hotplug
 1 file changed, 3 insertions(+), 13 deletions(-)

 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 9e971fffeb6a..d5d9ea864fe6 100644
+index 29f5d699fa06..c73fcdff0c16 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)
@ -466,5 +466,5 @@ index 9e971fffeb6a..d5d9ea864fe6 100644
 	bridge = pci_upstream_bridge(dev);
 	if (bridge)
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0008-surface-typecover.patch
+++ b/patches/5.10/0008-surface-typecover.patch
@ -1,4 +1,4 @@
-From 6fb4e20d005d0b409f787d093a01f6a13811f193 Mon Sep 17 00:00:00 2001
+From fd5799013f094f0dc9b85d684bcd28b3ba316784 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 e5a3704b9fe8..14910d6b7e24 100644
 	{ .driver_data = MT_CLS_GOOGLE,
 		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0009-surface-go-touchscreen.patch
+++ b/patches/5.10/0009-surface-go-touchscreen.patch
@ -1,4 +1,4 @@
-From 40a6c736a67eec223c149cc7511a708729fc5520 Mon Sep 17 00:00:00 2001
+From 7ece10048d535bfc6e5a4816fe674cdabef7cb7f Mon Sep 17 00:00:00 2001
 From: Zoltan Tamas Vajda <zoltan.tamas.vajda@gmail.com>
 Date: Thu, 3 Jun 2021 10:50:55 +0200
 Subject: [PATCH] Added quirk for Surface Go touchscreen
@ -35,5 +35,5 @@ index d1ab2dccf6fd..4548eace4d9f 100644
 };
 
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0010-surface-sensors.patch
+++ b/patches/5.10/0010-surface-sensors.patch
@ -1,4 +1,4 @@
-From 50fed5884f01f014c0ccf565c36ace45a1710682 Mon Sep 17 00:00:00 2001
+From 93858b67dd6463b3684bd82407a638df4e0d81f0 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 9afb3fcc74e6..20719141c03a 100644
 	.probe		= apds9960_probe,
 	.remove		= apds9960_remove,
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0011-cameras.patch
+++ b/patches/5.10/0011-cameras.patch
@ -1,4 +1,4 @@
-From 9a6d15f78587252049259f4d23d1f3cc5a541997 Mon Sep 17 00:00:00 2001
+From 44044c5f612e9a94830be9cbb80b92af1b0cb467 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
@ -314,9 +314,9 @@ index 146492383aa5..7650d7998a3f 100644
 
 struct cio2_csi2_timing {
 -- 
-2.32.0
+2.33.0

-From fdc66426610e43907709183cfe0fe6ec19c8818c Mon Sep 17 00:00:00 2001
+From 6982b461c1cfec607da2d964c810aec842239460 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
@ -348,9 +348,9 @@ index 2fe4a0bd0284..2061d7a50700 100644
 
 	mutex_lock(&q->subdev_lock);
 -- 
-2.32.0
+2.33.0

-From 6a1571be8e3ac8c7b9f9f8a4525f0490c0b4338b Mon Sep 17 00:00:00 2001
+From d50bd649c2f3c517f7a0a524f2cbe85609b97c41 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
@ -407,9 +407,9 @@ index 7650d7998a3f..ccf0b85ae36f 100644
 /* 32MB = 8xFBPT_entry */
 #define CIO2_MAX_LOPS					8
 -- 
-2.32.0
+2.33.0

-From 809f003a252b57dca13503dbb9c4e05d2e89b629 Mon Sep 17 00:00:00 2001
+From 0cddabc30fad4a1404b8a6772d2b87ada1614c25 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
@ -461,9 +461,9 @@ index a0202166e2b0..c0cd4606810c 100644
 		}
 		atomic_inc(&q->frame_sequence);
 -- 
-2.32.0
+2.33.0

-From 1717324c939e0ffb84cdfc7cb09563d4c2b7ef89 Mon Sep 17 00:00:00 2001
+From 00fbb7ad2178144acf44e8ac3a75ff171a9cde07 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
@ -513,9 +513,9 @@ index ccf0b85ae36f..62187ab5ae43 100644
 #define CIO2_DEVICE_NAME				"Intel IPU3 CIO2"
 #define CIO2_ENTITY_NAME				"ipu3-csi2"
 -- 
-2.32.0
+2.33.0

-From 527ed09188b1a9920ce5ce3a7537a6cdd61777c0 Mon Sep 17 00:00:00 2001
+From fc387bd6ebda2ff60af05685f2b29c9455104814 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
@ -558,9 +558,9 @@ index 4c43d30145c6..bc9c634df6df 100644
 }
 EXPORT_SYMBOL_GPL(fwnode_device_is_available);
 -- 
-2.32.0
+2.33.0

-From 5bfb5edd47de6b12dd982525a7bda28d05389e63 Mon Sep 17 00:00:00 2001
+From cde31fa820f9472bb9ca2f1a6d82edbce0b659f8 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
@ -602,9 +602,9 @@ index bc9c634df6df..ddba75d90af2 100644
 EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);
 
 -- 
-2.32.0
+2.33.0

-From 2846cc36b996c9067529611d94f86d842d758873 Mon Sep 17 00:00:00 2001
+From f8d9686ec7d3307792c6e15559d3f066711048c6 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
@ -705,9 +705,9 @@ index 206bd4d7d7e2..eb89bdb9232c 100644
 }
 EXPORT_SYMBOL_GPL(software_node_unregister_nodes);
 -- 
-2.32.0
+2.33.0

-From 47aadb85b2a217e6a2b0c1bea3cfc6c30f96056e Mon Sep 17 00:00:00 2001
+From e4e8444f6a41636b59183333189e4d3496504bbf 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
@ -760,9 +760,9 @@ index eb89bdb9232c..032b24f60c78 100644
 }
 EXPORT_SYMBOL_GPL(software_node_unregister_node_group);
 -- 
-2.32.0
+2.33.0

-From 5bb27047094135a40cdd9ac968d85e2cb4d2dadc Mon Sep 17 00:00:00 2001
+From 2b3811dbc9d11eec2ae069e37c5db5f49712adf0 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
@ -801,9 +801,9 @@ index 9506f8ec0974..72d36d46287d 100644
 
 /**
 -- 
-2.32.0
+2.33.0

-From f409a179d1bb38ab411e33ed8645cbc036bc5b27 Mon Sep 17 00:00:00 2001
+From 27a0c95117a3b11f45507dbae653708a8b828fd3 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
@ -969,9 +969,9 @@ index 032b24f60c78..7f056c5e0ed3 100644
 
 /* -------------------------------------------------------------------------- */
 -- 
-2.32.0
+2.33.0

-From 690785d85e5af79509806c7fcd03a25c5f17bb45 Mon Sep 17 00:00:00 2001
+From f7f7e8e638316c5458ff40e55114fe5935db477d 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
@ -1007,9 +1007,9 @@ index 7ac87f18a10f..7d60f24240a4 100644
 
 static void __init
 -- 
-2.32.0
+2.33.0

-From 04de95d83711b399d64287ebb9092b29df7270a4 Mon Sep 17 00:00:00 2001
+From 6eee51784d3bc344f93896ed29d189b9db64eded 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
@ -1038,9 +1038,9 @@ index 4fef10dd2975..7ac7d1ae8764 100644
 F:	drivers/media/pci/intel/ipu3/
 
 -- 
-2.32.0
+2.33.0

-From 2c2d51e7c1971288e9e03a857483da9382c97c84 Mon Sep 17 00:00:00 2001
+From d48c92cce2eade674d14c99c557b19e00d858ff1 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
@ -1073,9 +1073,9 @@ similarity index 100%
 rename from drivers/media/pci/intel/ipu3/ipu3-cio2.c
 rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 -- 
-2.32.0
+2.33.0

-From 1eb630ff976e433b62621515a9c4eda94a6b4b3c Mon Sep 17 00:00:00 2001
+From 01ebfc1b10d68ec668026591a26e9b671c9d9b06 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
@ -1114,9 +1114,9 @@ index 33babe6e8b3a..d23dff76da3d 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.32.0
+2.33.0

-From ee272d460a5f5cbe5c0d512334dc15ee5afda431 Mon Sep 17 00:00:00 2001
+From 799eea43ed8c71feacfb329553ef8f63406c204c 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
@ -1223,9 +1223,9 @@ index 6ad3b89a8a2e..7295aa50120a 100644
 {
 	if (adev)
 -- 
-2.32.0
+2.33.0

-From b150f1a0bd590417f29f8e3084d9f6f083a4ae6c Mon Sep 17 00:00:00 2001
+From ac851f980bef99b8b54416fb4bc2646d076e587a 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
@ -1300,9 +1300,9 @@ index ed0840f3d5df..6ca337c28b3c 100644
  * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
  * @fwnode: pointer to the endpoint's fwnode handle
 -- 
-2.32.0
+2.33.0

-From 778a6a05b1c5b51fa8f973317b91692d3a33aa70 Mon Sep 17 00:00:00 2001
+From ce756f29d8c396b26c058a7cf8d8640689da32bf 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
@ -1898,9 +1898,9 @@ index 62187ab5ae43..dc3e343a37fb 100644
 +
 #endif
 -- 
-2.32.0
+2.33.0

-From f46cf5b91ced1e8c476afc861fa0bba744362a06 Mon Sep 17 00:00:00 2001
+From cced3ca4a2f04bbcdca0fe483b297c59b8f510aa 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
@ -2000,9 +2000,9 @@ index ddca1550cce6..78b38775f18b 100644
  * acpi_dev_present - Detect that a given ACPI device is present
  * @hid: Hardware ID of the device.
 -- 
-2.32.0
+2.33.0

-From 3b0f082b6a6ae798f7eca080251ad53cff5579aa Mon Sep 17 00:00:00 2001
+From 5d0b3dd3871b3e2ee1ee54115a537c80800b9f34 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
@ -2086,9 +2086,9 @@ index 7295aa50120a..58f964471da5 100644
 acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv);
 struct acpi_device *
 -- 
-2.32.0
+2.33.0

-From 427dcd2629b69fbbe78c88b5e7b51c36d2a55577 Mon Sep 17 00:00:00 2001
+From d9639efefc4b1fa6f72de488d2ec0b294f5de17f 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()
@ -2154,9 +2154,9 @@ index a670ae129f4b..b18172f240af 100644
 {
 	return NULL;
 -- 
-2.32.0
+2.33.0

-From 81f1849d80465d03b85618606d65784ff8c1a5b7 Mon Sep 17 00:00:00 2001
+From e4312c1efc0a6adb7021a4e4764c786101f82bbe 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()
@ -2212,9 +2212,9 @@ index b18172f240af..269a2009080c 100644
 #else
 static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
 -- 
-2.32.0
+2.33.0

-From 80f4c19363358c51fdee447bb60a6d7ab265faf3 Mon Sep 17 00:00:00 2001
+From 42cba595f6e36a52c730a13cd75d9d4b61d1315e 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()
@ -2276,9 +2276,9 @@ index fdb1d5262ce8..817f53506cfe 100644
 
 static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
 -- 
-2.32.0
+2.33.0

-From 7613e1bf2dc2f17f0e2c89a0aba74f7d446887c9 Mon Sep 17 00:00:00 2001
+From c5db448122acc82fbb7e2eddfb7ed556aecfa066 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
@ -2467,9 +2467,9 @@ index 4a4df4ffd18c..000000000000
 -};
 -builtin_i2c_driver(tps68470_driver);
 -- 
-2.32.0
+2.33.0

-From bc210192599430528bdd6536c37a8aecd9c23606 Mon Sep 17 00:00:00 2001
+From 0b2abf80eacc0fad5737b6a4e665d8e900532a06 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
@ -3436,9 +3436,9 @@ index 000000000000..3fe27ec0caff
 +	return ret;
 +}
 -- 
-2.32.0
+2.33.0

-From 9d6eb2f23ba20945bc6ecc571704c08ed3405d8e Mon Sep 17 00:00:00 2001
+From acf520318209e5d1c210d38f037f9333caac2b01 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
@ -3506,9 +3506,9 @@ index 745a4e0c4994..87e45a800919 100644
 
 /**
 -- 
-2.32.0
+2.33.0

-From 83da61098870cb0b7c69c12081e33a33c8db9d09 Mon Sep 17 00:00:00 2001
+From bf2cf05540c9a7f740a226cdb27f4b7bf0feb1fc 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
@ -6863,9 +6863,9 @@ index 000000000000..9a508e1f3624
 +static unsigned long N_RES = N_RES_VIDEO;
 +#endif
 -- 
-2.32.0
+2.33.0

-From f615ea80c2456314f874eea6b48512e14c3058d7 Mon Sep 17 00:00:00 2001
+From a2ffd6268853732e494aa240b09e25af427fd9b8 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
@ -6904,9 +6904,9 @@ index 32485e4ed42b..f9ced52ad37a 100644
 
 	if (dev->indicator_led)
 -- 
-2.32.0
+2.33.0

-From 1b3b4d04e4ae339d1e57cc01272109c1a2468ff9 Mon Sep 17 00:00:00 2001
+From 507decfdaa198e029206d65c2fae6b5707544386 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
@ -6933,9 +6933,9 @@ index f9ced52ad37a..9fd44a3d1d85 100644
 	clk_disable_unprepare(dev->clk);
 
 -- 
-2.32.0
+2.33.0

-From efbaab144c4c329017759731a2e13dee0db58025 Mon Sep 17 00:00:00 2001
+From a9e6f06acd8fb41775045506450e30e13f5b2fdd 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
@ -7096,9 +7096,9 @@ index dd0ffcafa489..924d99d20328 100644
 	struct property_entry ep_properties[5];
 	struct property_entry dev_properties[3];
 -- 
-2.32.0
+2.33.0

-From 1f1657a10fd29b520c2d80d946a2c9271d16c81b Mon Sep 17 00:00:00 2001
+From e3c62c72714aa1b132391577576561c0f2364780 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
@ -7152,9 +7152,9 @@ index 9fd44a3d1d85..1a85800df7ed 100644
 	ov5693->ctrl_handler.lock = &ov5693->input_lock;
 	ov5693->sd.ctrl_handler = &ov5693->ctrl_handler;
 -- 
-2.32.0
+2.33.0

-From 2a609a8dd131f7bc04a36487476dabfefa3d955d Mon Sep 17 00:00:00 2001
+From 8b7765cbaf05f0cc2fffc5b678040cbdca460003 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
@ -7569,9 +7569,9 @@ index 3fe27ec0caff..40629291b339 100644
 		return -EINVAL;
 
 -- 
-2.32.0
+2.33.0

-From 165969e59a17b4d7fcb2cd3ba758cf914b3ea092 Mon Sep 17 00:00:00 2001
+From 0b2be482050cd556bc2d66822b5198722b9c3579 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
@ -7696,9 +7696,9 @@ index 42ae8396eb64..98eb1ec3399e 100644
 
 	acpi_dev_put(int3472->sensor);
 -- 
-2.32.0
+2.33.0

-From 1d8dab673003189189bd7e9afc1ee83c011ed628 Mon Sep 17 00:00:00 2001
+From 9dc1557d5b81063789573659ef0072c8eee0a398 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
@ -7800,9 +7800,9 @@ index 924d99d20328..e1e388cc9f45 100644
 	(const struct cio2_sensor_config) {	\
 		.hid = _HID,			\
 -- 
-2.32.0
+2.33.0

-From 10214fa721d6fccc3cbc3c961e7451e058e131c2 Mon Sep 17 00:00:00 2001
+From 06956f00ccdce14204498c4dcd44882223c9dd99 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()
@ -7922,9 +7922,9 @@ index 9a508e1f3624..26819cf3f4d2 100644
 
 enum ov5693_tok_type {
 -- 
-2.32.0
+2.33.0

-From 67ad0308a145ba0d1c3a5d2cbb7ed61f8f1381ab Mon Sep 17 00:00:00 2001
+From 926d367e531054e776f5ba187983f546b5df54d1 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
@ -7960,9 +7960,9 @@ index a9747ab783d7..7fb368eec327 100644
 						 V4L2_CID_HBLANK, hblank, hblank,
 						 1, hblank);
 -- 
-2.32.0
+2.33.0

-From dd5bf9fb107acc628dff64bc4295e90acfffa777 Mon Sep 17 00:00:00 2001
+From 2c477cc9fa67bad37509789928b193498d82b73c 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
@ -8036,9 +8036,9 @@ index 26819cf3f4d2..9d7eed97963b 100644
 
 };
 -- 
-2.32.0
+2.33.0

-From 0eea3733faca1eef0929d4191d18b4343203b838 Mon Sep 17 00:00:00 2001
+From 6c68ed26a0ef9e4c79ae3dd960de9f1d12c952cf 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
@ -8111,9 +8111,9 @@ index 1950d7ac2d54..cea767230aa9 100644
 	/* Gain */
 
 -- 
-2.32.0
+2.33.0

-From c3f40e8470a640b01fcc3537f17eee270ae45a71 Mon Sep 17 00:00:00 2001
+From fbfd169aa319758b34162cc369b568055c7539ca 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
@ -8147,9 +8147,9 @@ index cea767230aa9..f681dbfcec56 100644
 
 #define OV5693_GAIN_CTRL_H_REG			0x3504
 -- 
-2.32.0
+2.33.0

-From 0678d6dc801d6da526a476085dd3d74f285fa275 Mon Sep 17 00:00:00 2001
+From 1f0a3583c80f12e71325ea3261f69a7583034ae2 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
@ -8297,9 +8297,9 @@ index 9d7eed97963b..965208078c2b 100644
 };
 
 -- 
-2.32.0
+2.33.0

-From 85cd5c85e7874f26a8867b3ca2be8b3fdb580379 Mon Sep 17 00:00:00 2001
+From 4729a018d4284961a78f5c248d6c4eae87bed7e1 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
@ -8369,9 +8369,9 @@ index f681dbfcec56..51eb3b05d121 100644
 	/* Flip */
 
 -- 
-2.32.0
+2.33.0

-From 87536da9f003c95a26a2f22ad701c7224c660053 Mon Sep 17 00:00:00 2001
+From b175769d69e1e2c2f1bb837541a87df884d67507 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
@ -8432,9 +8432,9 @@ index 51eb3b05d121..952558c4f33b 100644
 }
 
 -- 
-2.32.0
+2.33.0

-From 168060f6df58790bb05041d80b25ad6ada6adc1d Mon Sep 17 00:00:00 2001
+From db02d24513842302a8e24f3a99637a5372eae8d6 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
@ -8467,9 +8467,9 @@ index 952558c4f33b..dd31083eeb7b 100644
 			       enable ? OV5693_START_STREAMING :
 			       OV5693_STOP_STREAMING);
 -- 
-2.32.0
+2.33.0

-From b534102819248eac835506c5d29b82e50430f6b8 Mon Sep 17 00:00:00 2001
+From 65b31ea32c19f20c79781b2a9dcd77651c2bd93b 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
@ -8506,9 +8506,9 @@ index 965208078c2b..7f1d31a82d3d 100644
 
 #define OV5693_NUM_SUPPLIES             2
 -- 
-2.32.0
+2.33.0

-From 73b7467e64dcfa601bd81362b1ad11683ef2ed96 Mon Sep 17 00:00:00 2001
+From e4e5a34cb3c9a770171be64ab8005d9b45ff8ba1 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
@ -9427,9 +9427,9 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644
         struct regulator_bulk_data supplies[OV5693_NUM_SUPPLIES];
 	struct clk *clk;
 -- 
-2.32.0
+2.33.0

-From 5ff97b493a91d818f1252ba1dfad49784739afea Mon Sep 17 00:00:00 2001
+From 3ef890cd5a30eba04799e52ebe764a31a7ff86a9 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
@ -9772,9 +9772,9 @@ index 70ccb3aae4c7..b78d3b474a43 100644
 	struct camera_sensor_platform_data *platform_data;
 	ktime_t timestamp_t_focus_abs;
 -- 
-2.32.0
+2.33.0

-From 92ac42ec1daad352f944236be262878c21ddda70 Mon Sep 17 00:00:00 2001
+From f31ee1e846710d80425d06a0de385bff84e1c6e4 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
@ -9943,9 +9943,9 @@ index f2eaa5f71a31..ce26ce86fbd5 100644
 	.pad = &ov5693_pad_ops,
 };
 -- 
-2.32.0
+2.33.0

-From be96a73783a26e423ba5bd8659e4277ad4851a72 Mon Sep 17 00:00:00 2001
+From bb8c583b58a336553c8af3d83de7e7b5ac4d7f73 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
@ -9984,9 +9984,9 @@ index ce26ce86fbd5..b3b391a49fdb 100644
 #include <media/v4l2-fwnode.h>
 
 -- 
-2.32.0
+2.33.0

-From e3e20fdc74abc4866ad9e4e4fd97729d56d838c0 Mon Sep 17 00:00:00 2001
+From f144c4fdbd6cf0755430587de207b0997f0d33e1 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
@ -10403,9 +10403,9 @@ index b3b391a49fdb..2c82b6578de9 100644
 
 	v4l2_i2c_subdev_init(&ov5693->sd, client, &ov5693_ops);
 -- 
-2.32.0
+2.33.0

-From 89b871c65429c97af8e02c467ed335904b1c1119 Mon Sep 17 00:00:00 2001
+From 526dd3df4d61f12a4fe12073d63b96e2d67d99dd 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
@ -10559,9 +10559,9 @@ index 2c82b6578de9..313bc9177328 100644
 	mutex_unlock(&ov5693->lock);
 	return ret;
 -- 
-2.32.0
+2.33.0

-From af1a0a7bda0dfee190b72e48ae0bc1a7a32127d3 Mon Sep 17 00:00:00 2001
+From e8e4eafbf08f084dd9c4d4d2305e609c1dde5972 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
@ -10705,9 +10705,9 @@ index b78d3b474a43..6502777eb5f3 100644
 #define OV5693_FRAME_OFF_NUM		0x4202
 #define OV5693_OTP_BYTE_MAX		32	//change to 32 as needed by otpdata
 -- 
-2.32.0
+2.33.0

-From bb355f481db0edacb0c5e19342c326f986374fd4 Mon Sep 17 00:00:00 2001
+From 464f290bb33320c976f9a20ba0178c121a21a42f 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
@ -10735,9 +10735,9 @@ index 313bc9177328..d092ed698eb3 100644
 		return -ENOMEM;
 
 -- 
-2.32.0
+2.33.0

-From ad003583211bd012de9e728bbbfb194c6f20bb40 Mon Sep 17 00:00:00 2001
+From 4bf892597600be5a0e0513b853b5db76f5aac83d 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
@ -10792,9 +10792,9 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644
 #define OV5693_LINK_FREQ_400MHZ		400000000
 /* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample
 -- 
-2.32.0
+2.33.0

-From de36f872ad563328530b088a5710451cafc26fa9 Mon Sep 17 00:00:00 2001
+From 289adb42d8ad933639a31abb3b717cffbe35b15c 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
@ -10866,9 +10866,9 @@ index 8082d37841da..c580159079d2 100644
 
 static int ov5693_get_regulators(struct ov5693_device *ov5693)
 -- 
-2.32.0
+2.33.0

-From 1ad63640be30fcd140be14538d103a4c2923420e Mon Sep 17 00:00:00 2001
+From fda79c287431291d024e080a04b85cf4ff743cd4 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
@ -10909,9 +10909,9 @@ index c580159079d2..9f61b470f8ba 100644
 				       ov5693->supplies);
 }
 -- 
-2.32.0
+2.33.0

-From 4f05d8705fb88e3c7854ac12a54e7a11b9c37cfd Mon Sep 17 00:00:00 2001
+From 57a757589c9ba8a067b18300a64999f41d9f2c9f 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
@ -10988,9 +10988,9 @@ index 9f61b470f8ba..622a7ddf4063 100644
 	return 0;
 }
 -- 
-2.32.0
+2.33.0

-From 298bcba816e737d2ae899fd60509688c318837fa Mon Sep 17 00:00:00 2001
+From 18284d1bf408f7f217a89b59099d4b344f18ed75 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
@ -11417,9 +11417,9 @@ index 0dfbbe9a0ff2..29e6735112da 100644
 static unsigned long N_RES = N_RES_VIDEO;
 -#endif
 -- 
-2.32.0
+2.33.0

-From cb4677a0ba7c6d511bb20aee9831a9eaecb5f33b Mon Sep 17 00:00:00 2001
+From 901afe150703734ed762831326a76cb1d816d120 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
@ -11658,5 +11658,5 @@ index 29e6735112da..0377853f8b2b 100644
 	int otp_size;
 	u8 *otp_data;
 -- 
-2.32.0
+2.33.0

--- a/patches/5.10/0012-ath10k-firmware-override.patch
+++ b/patches/5.10/0012-ath10k-firmware-override.patch
@ -1,4 +1,4 @@
-From dbac7d5aa420652ceb6008fad28542c35c5f53aa Mon Sep 17 00:00:00 2001
+From ad3d157d8e23b5e732ce14ae91c45fa8305066fb 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
@ -117,5 +117,5 @@ index d73ad60b571c..f242fd4b81a6 100644
 	ret = firmware_request_nowarn(&fw, filename, ar->dev);
 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.32.0
+2.33.0