Update v5.10 patches

Changes:
 - SAM:
   - Move and split drivers to closer reflect upstreaming process
   - Various updates to HID and battery/AC drivers for upstreaming

 - Hotplug:
   - Various fixes and improvements

 - GPE:
   - Fix Kconfig dependency

 - IPTS
   - Various fixes and improvements

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/5c7b5b588e18eda5a1e2375110b241a79d9ccf43
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/bee2add45fb668a794406ce6a648cece4fd00d51
 - GPE: https://github.com/linux-surface/surface-gpe/commit/6ecfdb39050129bf17e5f1fff784e4df7aa56171
 - Hotplug: https://github.com/linux-surface/surface-hotplug/commit/595ed62f24417b2ac97f4658cfc30776c9b888cf
 - IPTS: https://github.com/linux-surface/intel-precise-touch/commit/3642d0e4ebf98ded318cf4bcbc79c90c449b321f

configs/surface-5.10.config

@@ -6,12 +6,17 @@ CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
 CONFIG_SURFACE_AGGREGATOR_BUS=y
 CONFIG_SURFACE_AGGREGATOR_CDEV=m
 CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+
 CONFIG_SURFACE_ACPI_NOTIFY=m
-CONFIG_SURFACE_BATTERY=m
 CONFIG_SURFACE_DTX=m
-CONFIG_SURFACE_HID=m
 CONFIG_SURFACE_PERFMODE=m
 
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=m
+
 #
 # Surface Hotplug
 #

patches/5.10/0001-surface3-oemb.patch

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

patches/5.10/0002-wifi.patch

@@ -1,4 +1,4 @@
-From 87009a45b3fb8bd697cca306828bb7bc7f6d80d5 Mon Sep 17 00:00:00 2001
+From 7142aae4519bf0728c574940e21cc7ab2c4a9e0f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Thu, 24 Sep 2020 18:02:06 +0900
 Subject: [PATCH] mwifiex: pcie: skip cancel_work_sync() on reset failure path
@@ -154,9 +154,9 @@ index 843d57eda820..5ed613d65709 100644
  
  static inline int
 -- 
-2.30.0
+2.30.1
 
-From ea4297c1c464ab216c09d25c2f1af292c228b18e Mon Sep 17 00:00:00 2001
+From 8ee97a2be558e3ee3fbdcee4c3934ffc46df6a66 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
@@ -362,9 +362,9 @@ index 000000000000..5326ae7e5671
 +
 +void mwifiex_initialize_quirks(struct pcie_service_card *card);
 -- 
-2.30.0
+2.30.1
 
-From f36f5936f9fbca30a9e9ef785015186bca8ee006 Mon Sep 17 00:00:00 2001
+From 012378c78ce0aa9f54e6233fb03f15ab662b4bff 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+
@@ -563,9 +563,9 @@ index 5326ae7e5671..8b9dcb5070d8 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
 +int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.30.0
+2.30.1
 
-From c8cbe2b6d4c0b8d5a6d30f6e4cab17390adf5b77 Mon Sep 17 00:00:00 2001
+From e0e72a8bd4641edbd1f4f3c386f8573b3359a713 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
@@ -742,9 +742,9 @@ index 8b9dcb5070d8..3ef7440418e3 100644
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 +int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
 -- 
-2.30.0
+2.30.1
 
-From 970c5d56583d2a940706580cea083a14431d7aa0 Mon Sep 17 00:00:00 2001
+From 7690864649999f7373e5800a04b4b053efb9232a 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
@@ -804,9 +804,9 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
  		.ident = "Surface Pro 3",
  		.matches = {
 -- 
-2.30.0
+2.30.1
 
-From 30ac4d3ad1f5f70e9cf12e249d8f78d680359fe0 Mon Sep 17 00:00:00 2001
+From 9db151b0136ea9d7d9170020e0c74d45fa17a824 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Thu, 24 Sep 2020 01:56:34 +0900
 Subject: [PATCH] mwifiex: pcie: use shutdown_sw()/reinit_sw() on
@@ -946,9 +946,9 @@ index 94561ddaf126..7b25335f1df3 100644
  	return 0;
  }
 -- 
-2.30.0
+2.30.1
 
-From 0e150dd486af10093035f0cc54a1e3a67cf11b65 Mon Sep 17 00:00:00 2001
+From 3b864ce43d794995d3f3ea182ad5bff74be4a573 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 24 Aug 2020 17:11:35 +0900
 Subject: [PATCH] mwifiex: pcie: add enable_device_dump module parameter
@@ -995,9 +995,9 @@ index 7b25335f1df3..f7e0b86eb553 100644
  	if (!adapter->devdump_data) {
  		mwifiex_dbg(adapter, ERROR,
 -- 
-2.30.0
+2.30.1
 
-From a17560e923a7e1e8928e051bf2edecdf5d4dafc5 Mon Sep 17 00:00:00 2001
+From 31ab9786797227365c34354d842efe0aaf6e62dd 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+
@@ -1150,9 +1150,9 @@ index 3ef7440418e3..a95ebac06e13 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.30.0
+2.30.1
 
-From e1b592170064cb85d811337b40ad0f30ec7526f8 Mon Sep 17 00:00:00 2001
+From 9c5b054473350dae8139e9b5c1ceea86b0560264 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:25:48 +0900
 Subject: [PATCH] mwifiex: add allow_ps_mode module parameter
@@ -1212,9 +1212,9 @@ index a6b9dc6700b1..943bc1e8ceae 100644
  }
  
 -- 
-2.30.0
+2.30.1
 
-From cad3b0ba3e206ec40d3f425da7f7308d2f43556b Mon Sep 17 00:00:00 2001
+From 635922ff9b7d620d892a0bf5757dbc852d432a2e Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:38:48 +0900
 Subject: [PATCH] mwifiex: print message when changing ps_mode
@@ -1247,9 +1247,9 @@ index 943bc1e8ceae..a2eb8df8d385 100644
  }
  
 -- 
-2.30.0
+2.30.1
 
-From dfa6f63ee590f00a02c0cf7fbb899a573f034ed0 Mon Sep 17 00:00:00 2001
+From c53651a257e2f7af1daa566df43e7724ac75e04f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:59:37 +0900
 Subject: [PATCH] mwifiex: disable ps_mode explicitly by default instead
@@ -1295,5 +1295,5 @@ index d3a968ef21ef..9b7b52fbc9c4 100644
  
  		if (drcs) {
 -- 
-2.30.0
+2.30.1
 

patches/5.10/0004-surface-gpe.patch

@@ -1,4 +1,4 @@
-From c15d0471a2ab876031795b0002666e2d774a27bb Mon Sep 17 00:00:00 2001
+From ae725f58a769c0b98d72e612af0657fd21801ef4 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.30.0
+2.30.1
 

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

@@ -1,4 +1,4 @@
-From d46cbd24104243e4e7c4c01d28ed503fab46c8ea Mon Sep 17 00:00:00 2001
+From 7fcb1bb56b0aeef64bb650f5cd7e40d56c1b8a06 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -108,9 +108,9 @@ index 37c510d9347a..aed579942436 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.30.0
+2.30.1
 
-From ebd07cf190014ef57f7bc9f179cb92c2bcd54d90 Mon Sep 17 00:00:00 2001
+From 636027109cba56a411620d37a35fb9b56d6ec302 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.30.0
+2.30.1
 

patches/5.10/0007-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From 57ef85688b82ee9f409b65c6fb065b6a529aef12 Mon Sep 17 00:00:00 2001
+From 97b4cb5fe354ae2aa11a51bf0add7434f65da636 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 9 Nov 2020 14:23:00 +0100
 Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
@@ -56,9 +56,9 @@ index 6427cbd0a5be..3200afed2604 100644
  		return err;
  
 -- 
-2.30.0
+2.30.1
 
-From 249b96f567db1adb80007428177141f6aec5c61f Mon Sep 17 00:00:00 2001
+From e99a49e3321f5f210825bd1cd35b04f9aff73a92 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
@@ -129,9 +129,9 @@ index d15c881e2e7e..b15f754e6346 100644
  	&dev_attr_vendor.attr,
  	&dev_attr_device.attr,
 -- 
-2.30.0
+2.30.1
 
-From de32407f6bf024ae5550c26f8a21546ab46c97ec Mon Sep 17 00:00:00 2001
+From 0702027c25539792b81325e843377c54010d8d56 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
@@ -144,17 +144,17 @@ appropriate signal to the PCIe hot-plug driver core.
 Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
 Patchset: surface-hotplug
 ---
- drivers/platform/x86/Kconfig           |  12 ++
+ drivers/platform/x86/Kconfig           |  20 ++
  drivers/platform/x86/Makefile          |   1 +
- drivers/platform/x86/surface_hotplug.c | 267 +++++++++++++++++++++++++
- 3 files changed, 280 insertions(+)
+ drivers/platform/x86/surface_hotplug.c | 282 +++++++++++++++++++++++++
+ 3 files changed, 303 insertions(+)
  create mode 100644 drivers/platform/x86/surface_hotplug.c
 
 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
-index a9b12f4dcbd1..3e882b1e1f74 100644
+index dbb07644c312..0c513c8bbd2b 100644
 --- a/drivers/platform/x86/Kconfig
 +++ b/drivers/platform/x86/Kconfig
-@@ -910,6 +910,18 @@ config SURFACE_GPE
+@@ -1012,6 +1012,26 @@ config SURFACE_GPE
  	  accordingly. It is required on those devices to allow wake-ups from
  	  suspend by opening the lid.
  
@@ -163,21 +163,29 @@ index a9b12f4dcbd1..3e882b1e1f74 100644
 +	depends on ACPI
 +	default m
 +	help
-+	  Driver for the Surface discrete GPU (dGPU) hot-plug system.
++	  Driver for out-of-band hot-plug event signaling on Microsoft Surface
++	  devices with hot-pluggable PCIe cards.
 +
-+	  This driver provides support for out-of-band hot-plug event signaling
-+	  on Surface Book 2 and 3 devices. This out-of-band signaling is
-+	  required to notify the kernel of any hot-plug events when the dGPU is
-+	  powered off, i.e. in D3cold.
++	  This driver is used on Surface Book (2 and 3) devices with a
++	  hot-pluggable discrete GPU (dGPU). When not in use, the dGPU on those
++	  devices can enter D3cold, which prevents in-band (standard) PCIe
++	  hot-plug signaling. Thus, without this driver, detaching the base
++	  containing the dGPU will not correctly update the state of the
++	  corresponding PCIe device if it is in D3cold. This driver adds support
++	  for out-of-band hot-plug notifications, ensuring that the device state
++	  is properly updated even when the device in question is in D3cold.
++
++	  Select M or Y here, if you want to (fully) support hot-plugging of
++	  dGPU devices on the Surface Book 2 and/or 3 during D3cold.
 +
  config SURFACE_BOOK1_DGPU_SWITCH
  	tristate "Surface Book 1 dGPU Switch Driver"
  	depends on ACPI && SYSFS
 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
-index 562d83940e7b..2009224dcaae 100644
+index 2e0a2896c78d..f552cbfb7914 100644
 --- a/drivers/platform/x86/Makefile
 +++ b/drivers/platform/x86/Makefile
-@@ -87,6 +87,7 @@ obj-$(CONFIG_SURFACE_3_BUTTON)		+= surface3_button.o
+@@ -94,6 +94,7 @@ obj-$(CONFIG_SURFACE_3_BUTTON)		+= surface3_button.o
  obj-$(CONFIG_SURFACE_3_POWER_OPREGION)	+= surface3_power.o
  obj-$(CONFIG_SURFACE_PRO3_BUTTON)	+= surfacepro3_button.o
  obj-$(CONFIG_SURFACE_GPE)		+= surface_gpe.o
@@ -187,13 +195,13 @@ index 562d83940e7b..2009224dcaae 100644
  # MSI
 diff --git a/drivers/platform/x86/surface_hotplug.c b/drivers/platform/x86/surface_hotplug.c
 new file mode 100644
-index 000000000000..572fba30cd77
+index 000000000000..cfcc15cfbacb
 --- /dev/null
 +++ b/drivers/platform/x86/surface_hotplug.c
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,282 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
-+ * Surface Book (gen. 2 and later) hot-plug driver.
++ * Surface Book (2 and later) hot-plug driver.
 + *
 + * Surface Book devices (can) have a hot-pluggable discrete GPU (dGPU). This
 + * driver is responsible for out-of-band hot-plug event signaling on these
@@ -203,7 +211,7 @@ index 000000000000..572fba30cd77
 + * Event signaling is handled via ACPI, which will generate the appropriate
 + * device-check notifications to be picked up by the PCIe hot-plug driver.
 + *
-+ * Copyright (C) 2019-2020 Maximilian Luz <luzmaximilian@gmail.com>
++ * Copyright (C) 2019-2021 Maximilian Luz <luzmaximilian@gmail.com>
 + */
 +
 +#include <linux/acpi.h>
@@ -233,8 +241,7 @@ index 000000000000..572fba30cd77
 +
 +/* 5515a847-ed55-4b27-8352-cd320e10360a */
 +static const guid_t shps_dsm_guid =
-+	GUID_INIT(0x5515a847, 0xed55, 0x4b27, 0x83, 0x52, 0xcd,
-+		  0x32, 0x0e, 0x10, 0x36, 0x0a);
++	GUID_INIT(0x5515a847, 0xed55, 0x4b27, 0x83, 0x52, 0xcd, 0x32, 0x0e, 0x10, 0x36, 0x0a);
 +
 +#define SHPS_DSM_REVISION		1
 +
@@ -247,11 +254,10 @@ index 000000000000..572fba30cd77
 +};
 +
 +enum shps_irq_type {
-+	/* NOTE: Must be in order of DSM function */
++	/* NOTE: Must be in order of enum shps_dsm_fn above. */
 +	SHPS_IRQ_TYPE_BASE_PRESENCE	= 0,
 +	SHPS_IRQ_TYPE_DEVICE_POWER	= 1,
 +	SHPS_IRQ_TYPE_DEVICE_PRESENCE	= 2,
-+
 +	SHPS_NUM_IRQS,
 +};
 +
@@ -262,15 +268,19 @@ index 000000000000..572fba30cd77
 +};
 +
 +struct shps_device {
-+	struct mutex lock[SHPS_NUM_IRQS];
++	struct mutex lock[SHPS_NUM_IRQS];  /* Protects update in shps_dsm_notify_irq() */
 +	struct gpio_desc *gpio[SHPS_NUM_IRQS];
 +	unsigned int irq[SHPS_NUM_IRQS];
 +};
 +
 +#define SHPS_IRQ_NOT_PRESENT		((unsigned int)-1)
 +
-+static void shps_dsm_notify_irq(struct platform_device *pdev,
-+				enum shps_irq_type type)
++static enum shps_dsm_fn shps_dsm_fn_for_irq(enum shps_irq_type type)
++{
++	return SHPS_DSM_FN_IRQ_BASE_PRESENCE + type;
++}
++
++static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type type)
 +{
 +	struct shps_device *sdev = platform_get_drvdata(pdev);
 +	acpi_handle handle = ACPI_HANDLE(&pdev->dev);
@@ -283,42 +293,37 @@ index 000000000000..572fba30cd77
 +	value = gpiod_get_value_cansleep(sdev->gpio[type]);
 +	if (value < 0) {
 +		mutex_unlock(&sdev->lock[type]);
-+		dev_err(&pdev->dev, "failed to get gpio: %d (irq=%d)\n",
-+			type, value);
++		dev_err(&pdev->dev, "failed to get gpio: %d (irq=%d)\n", type, value);
 +		return;
 +	}
 +
-+	dev_dbg(&pdev->dev, "IRQ notification via DSM (irq=%d, value=%d)\n",
-+		type, value);
++	dev_dbg(&pdev->dev, "IRQ notification via DSM (irq=%d, value=%d)\n", type, value);
 +
 +	param.type = ACPI_TYPE_INTEGER;
 +	param.integer.value = value;
 +
 +	result = acpi_evaluate_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION,
-+				   SHPS_DSM_FN_IRQ_BASE_PRESENCE + type, &param);
++				   shps_dsm_fn_for_irq(type), &param);
 +
 +	if (!result) {
-+		mutex_unlock(&sdev->lock[type]);
-+		dev_err(&pdev->dev,
-+			"IRQ notification via DSM failed (irq=%d, gpio=%d)\n",
++		dev_err(&pdev->dev, "IRQ notification via DSM failed (irq=%d, gpio=%d)\n",
 +			type, value);
-+		return;
-+	}
 +
-+	if (result->type != ACPI_TYPE_BUFFER) {
++	} else if (result->type != ACPI_TYPE_BUFFER) {
 +		dev_err(&pdev->dev,
 +			"IRQ notification via DSM failed: unexpected result type (irq=%d, gpio=%d)\n",
 +			type, value);
-+	}
 +
-+	if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
++	} else if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
 +		dev_err(&pdev->dev,
 +			"IRQ notification via DSM failed: unexpected result value (irq=%d, gpio=%d)\n",
 +			type, value);
 +	}
 +
 +	mutex_unlock(&sdev->lock[type]);
-+	ACPI_FREE(result);
++
++	if (result)
++		ACPI_FREE(result);
 +}
 +
 +static irqreturn_t shps_handle_irq(int irq, void *data)
@@ -348,17 +353,16 @@ index 000000000000..572fba30cd77
 +	struct gpio_desc *gpiod;
 +	acpi_handle handle = ACPI_HANDLE(&pdev->dev);
 +	const char *irq_name;
-+	const int dsm = SHPS_DSM_FN_IRQ_BASE_PRESENCE + type;
++	const int dsm = shps_dsm_fn_for_irq(type);
 +	int status, irq;
 +
-+	/* Initialize as "not present". */
-+	sdev->gpio[type] = NULL;
-+	sdev->irq[type] = SHPS_IRQ_NOT_PRESENT;
-+
-+	/* Only set up interrupts that we actually need. */
++	/*
++	 * Only set up interrupts that we actually need: The Surface Book 3
++	 * does not have a DSM for base presence, so don't set up an interrupt
++	 * for that.
++	 */
 +	if (!acpi_check_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION, BIT(dsm))) {
-+		dev_dbg(&pdev->dev, "IRQ notification via DSM not present (irq=%d)\n",
-+			type);
++		dev_dbg(&pdev->dev, "IRQ notification via DSM not present (irq=%d)\n", type);
 +		return 0;
 +	}
 +
@@ -387,11 +391,33 @@ index 000000000000..572fba30cd77
 +	return 0;
 +}
 +
++static int surface_hotplug_remove(struct platform_device *pdev)
++{
++	struct shps_device *sdev = platform_get_drvdata(pdev);
++	int i;
++
++	/* Ensure that IRQs have been fully handled and won't trigger any more. */
++	for (i = 0; i < SHPS_NUM_IRQS; i++) {
++		if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
++			disable_irq(sdev->irq[i]);
++
++		mutex_destroy(&sdev->lock[i]);
++	}
++
++	return 0;
++}
++
 +static int surface_hotplug_probe(struct platform_device *pdev)
 +{
 +	struct shps_device *sdev;
 +	int status, i;
 +
++	/*
++	 * The MSHW0153 device is also present on the Surface Laptop 3,
++	 * however that doesn't have a hot-pluggable PCIe device. It also
++	 * doesn't have any GPIO interrupts/pins under the MSHW0153, so filter
++	 * it out here.
++	 */
 +	if (gpiod_count(&pdev->dev, NULL) < 0)
 +		return -ENODEV;
 +
@@ -405,15 +431,21 @@ index 000000000000..572fba30cd77
 +
 +	platform_set_drvdata(pdev, sdev);
 +
++	/*
++	 * Initialize IRQs so that we can safely call surface_hotplug_remove()
++	 * on errors.
++	 */
++	for (i = 0; i < SHPS_NUM_IRQS; i++)
++		sdev->irq[i] = SHPS_IRQ_NOT_PRESENT;
++
 +	/* Set up IRQs. */
 +	for (i = 0; i < SHPS_NUM_IRQS; i++) {
 +		mutex_init(&sdev->lock[i]);
 +
 +		status = shps_setup_irq(pdev, i);
 +		if (status) {
-+			dev_err(&pdev->dev, "failed to set up IRQ %d: %d\n",
-+				i, status);
-+			return status;
++			dev_err(&pdev->dev, "failed to set up IRQ %d: %d\n", i, status);
++			goto err;
 +		}
 +	}
 +
@@ -423,19 +455,10 @@ index 000000000000..572fba30cd77
 +			shps_dsm_notify_irq(pdev, i);
 +
 +	return 0;
-+}
 +
-+static int surface_hotplug_remove(struct platform_device *pdev)
-+{
-+	struct shps_device *sdev = platform_get_drvdata(pdev);
-+	int i;
-+
-+	/* Ensure that IRQs have been fully handled and won't trigger any more. */
-+	for (i = 0; i < SHPS_NUM_IRQS; i++)
-+		if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
-+			disable_irq(sdev->irq[i]);
-+
-+	return 0;
++err:
++	surface_hotplug_remove(pdev);
++	return status;
 +}
 +
 +static const struct acpi_device_id surface_hotplug_acpi_match[] = {
@@ -459,5 +482,5 @@ index 000000000000..572fba30cd77
 +MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.0
+2.30.1
 

patches/5.10/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 9312f4e776a9360673602ce5675a6f637c92bc9e Mon Sep 17 00:00:00 2001
+From e1b4a113984cf38f01c2a0e2bbf4e8192664ce0d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -229,5 +229,5 @@ index 8429ebe7097e..44d48e8bbe1a 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.30.0
+2.30.1
 

patches/5.10/0009-surface-sensors.patch

@@ -1,4 +1,4 @@
-From d0827ea95a7772ae5116adf1633c97ff34c9d4e8 Mon Sep 17 00:00:00 2001
+From 46132805b14e21b99d61fb2f35b459c638c87dca 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.30.0
+2.30.1
 

patches/5.10/0010-cameras.patch

@@ -1,4 +1,4 @@
-From ed24364fb437a6054fbc366d8fc698d2fc79af7f Mon Sep 17 00:00:00 2001
+From 3b09d327318b99c630c758d32d28aff5ca65c072 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.30.0
+2.30.1
 
-From 8aed30a215d2c096e1940429fff3624a67637737 Mon Sep 17 00:00:00 2001
+From c6fc4d5d0b225173cfbe1df908c8950c3f40f0bc 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 1fcd131482e0..b2679ff185fc 100644
  
  	mutex_lock(&q->subdev_lock);
 -- 
-2.30.0
+2.30.1
 
-From 97685366515d61f30839738c7b479d0ba5f4f5a0 Mon Sep 17 00:00:00 2001
+From 74f14515d35868f08cb32111ae06c33d0a7eda81 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.30.0
+2.30.1
 
-From 6fc30f110028daed2167569c6dce718cb20dc31d Mon Sep 17 00:00:00 2001
+From 656111f0523d4ab97cac8437c1617a241bece72e 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 51c4dd6a8f9a..c557d189200b 100644
  		}
  		atomic_inc(&q->frame_sequence);
 -- 
-2.30.0
+2.30.1
 
-From 58617cfcef69ce39c279cb2f4ca9b33c48d0fca6 Mon Sep 17 00:00:00 2001
+From 02ff48a15f0e0da02d088fc4c7ec959b97d6016d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Oct 2020 23:42:09 +0100
 Subject: [PATCH] software_node: Fix refcounts in
@@ -509,9 +509,9 @@ index 010828fc785b..615a0c93e116 100644
  
  static struct fwnode_handle *
 -- 
-2.30.0
+2.30.1
 
-From cd8c81083dcefac62552fbe2e0232c0c24531556 Mon Sep 17 00:00:00 2001
+From 012323f01e585cb17073d859cba7392a9119c613 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
@@ -561,9 +561,9 @@ index ccf0b85ae36f..62187ab5ae43 100644
  #define CIO2_DEVICE_NAME				"Intel IPU3 CIO2"
  #define CIO2_ENTITY_NAME				"ipu3-csi2"
 -- 
-2.30.0
+2.30.1
 
-From 95ab872413990945f24729a3f0517b5ce1cdb2c7 Mon Sep 17 00:00:00 2001
+From 02efb9f2e40c323cf51d9b3807e2dbea40f08d26 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
@@ -606,9 +606,9 @@ index 4c43d30145c6..bc9c634df6df 100644
  }
  EXPORT_SYMBOL_GPL(fwnode_device_is_available);
 -- 
-2.30.0
+2.30.1
 
-From 8008601acd83d358cfe0308224bb7e886a134419 Mon Sep 17 00:00:00 2001
+From 41d95371ec70fb792fdf404e09c7bc422116741d 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
@@ -650,9 +650,9 @@ index bc9c634df6df..ddba75d90af2 100644
  EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);
  
 -- 
-2.30.0
+2.30.1
 
-From 3e0e09a48830c0cb4c15dec7c5c3760d238ad884 Mon Sep 17 00:00:00 2001
+From 077ca29de10ed13810d77e4b5283b2b71141b685 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
@@ -753,9 +753,9 @@ index 615a0c93e116..ade49173ff8d 100644
  }
  EXPORT_SYMBOL_GPL(software_node_unregister_nodes);
 -- 
-2.30.0
+2.30.1
 
-From 772283d34ad71fc6dd4ebc74fb62bd680c7bcd0f Mon Sep 17 00:00:00 2001
+From 9cfcb92a9d56040c58453f7ff517112103f96a96 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
@@ -808,9 +808,9 @@ index ade49173ff8d..1f43c51b431e 100644
  }
  EXPORT_SYMBOL_GPL(software_node_unregister_node_group);
 -- 
-2.30.0
+2.30.1
 
-From 0bf93927e968bd0ac2a0b137f8416e5ea2cd4fe4 Mon Sep 17 00:00:00 2001
+From b07d850a68e50eaa31b6d51d3a235c6a3d027f7c 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
@@ -849,9 +849,9 @@ index 9506f8ec0974..72d36d46287d 100644
  
  /**
 -- 
-2.30.0
+2.30.1
 
-From 1524841c902cef0d456370e9ec40773a8fe6b74b Mon Sep 17 00:00:00 2001
+From 048747fc7cf291e76bc88d36ce7e174dbe67c86d 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
@@ -1017,9 +1017,9 @@ index 1f43c51b431e..2ff504aca0be 100644
  
  /* -------------------------------------------------------------------------- */
 -- 
-2.30.0
+2.30.1
 
-From de435b7905156d7a5ce8c3eeeffd14b73526b949 Mon Sep 17 00:00:00 2001
+From e5a525987762827d42408d301651ddd7dee58a13 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
@@ -1055,9 +1055,9 @@ index 7ac87f18a10f..7d60f24240a4 100644
  
  static void __init
 -- 
-2.30.0
+2.30.1
 
-From 441936189d0bb02ecc81b9c199e6b7c11db462df Mon Sep 17 00:00:00 2001
+From 7db14aecb682f2821c02420dc3356f311591ff12 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
@@ -1086,9 +1086,9 @@ index 281de213ef47..5a1c6e959aa8 100644
  F:	drivers/media/pci/intel/ipu3/
  
 -- 
-2.30.0
+2.30.1
 
-From e1228c81e5c347a906bfb35909d0a933e9f3b0f5 Mon Sep 17 00:00:00 2001
+From 5cd26f650205295b0162859db1855119daa50b30 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
@@ -1121,9 +1121,9 @@ similarity index 100%
 rename from drivers/media/pci/intel/ipu3/ipu3-cio2.c
 rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 -- 
-2.30.0
+2.30.1
 
-From d3156ac8e9ec15e8d8b048566208fc79fd4d8310 Mon Sep 17 00:00:00 2001
+From 173774fc8274db26b11e9518948d7dc2fbd2a286 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
@@ -1162,9 +1162,9 @@ index e3ab003a6c85..9dd896d085ec 100644
  	 * Otherwise, check if the sd fwnode and the asd fwnode refer to an
  	 * endpoint or a device. If they're of the same type, there's no match.
 -- 
-2.30.0
+2.30.1
 
-From 8f6d6ea7131a9410c50d62c8bd90b8cd0a6f7c28 Mon Sep 17 00:00:00 2001
+From 54866c066f7eb157f72611427af44096d6ed388e 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
@@ -1271,9 +1271,9 @@ index 6d1879bf9440..02a716a0af5d 100644
  {
  	put_device(&adev->dev);
 -- 
-2.30.0
+2.30.1
 
-From 0da8a119fe89d3af5619454979cd674e5b432649 Mon Sep 17 00:00:00 2001
+From 3a8c20986a3b297f30269464f628439b23b0ed7e 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
@@ -1348,9 +1348,9 @@ index ed0840f3d5df..6ca337c28b3c 100644
   * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
   * @fwnode: pointer to the endpoint's fwnode handle
 -- 
-2.30.0
+2.30.1
 
-From 41237a915cef967de91160c85d7493a6b5be7ade Mon Sep 17 00:00:00 2001
+From d3d67a61296add16ecd644971ec0ac25a6ba1022 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
@@ -1946,9 +1946,9 @@ index 62187ab5ae43..dc3e343a37fb 100644
 +
  #endif
 -- 
-2.30.0
+2.30.1
 
-From 688186f7c659840fd6c340a892f0a8a21efb18b9 Mon Sep 17 00:00:00 2001
+From 66c0bc2e1a548ce3d1f6e7b3356c29c702c137ac 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
@@ -2048,9 +2048,9 @@ index ddca1550cce6..78b38775f18b 100644
   * acpi_dev_present - Detect that a given ACPI device is present
   * @hid: Hardware ID of the device.
 -- 
-2.30.0
+2.30.1
 
-From a146f0d32f0171eb9ae965cd61f68912e600cba1 Mon Sep 17 00:00:00 2001
+From 19bdf96ef080ad643ced9c7810156857d30d21ee 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
@@ -2134,9 +2134,9 @@ index 02a716a0af5d..33deb22294f2 100644
  acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv);
  struct acpi_device *
 -- 
-2.30.0
+2.30.1
 
-From 197141d81abfb7f5b1ad712ffffb4bcc69311a68 Mon Sep 17 00:00:00 2001
+From ec31436438fd065f39e144fbd8652d292bf07f05 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()
@@ -2202,9 +2202,9 @@ index 56622658b215..65acae61dc5c 100644
  {
  	return NULL;
 -- 
-2.30.0
+2.30.1
 
-From 4d0822207995850a85f0404045605c2088eaf90f Mon Sep 17 00:00:00 2001
+From 8b7807ff6bca711e87af1b6e5b11f0495f36c6ef 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()
@@ -2260,9 +2260,9 @@ index 65acae61dc5c..b82aac05b17f 100644
  #else
  static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
 -- 
-2.30.0
+2.30.1
 
-From 7770ea608e64e8be3394cb2a9ec3d533f0a6b972 Mon Sep 17 00:00:00 2001
+From df44db561d8855d0255503e20268c08c01c3c5ee 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()
@@ -2324,9 +2324,9 @@ index 5b1dc1ad4fb3..47ae139e8781 100644
  
  /* Device properties */
 -- 
-2.30.0
+2.30.1
 
-From 31aff03814589c16f1d18c56086a577d6aad37dd Mon Sep 17 00:00:00 2001
+From 89313343dd227867456401fe62cf944058e47534 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
@@ -2515,9 +2515,9 @@ index 4a4df4ffd18c..000000000000
 -};
 -builtin_i2c_driver(tps68470_driver);
 -- 
-2.30.0
+2.30.1
 
-From bd908144bb8a2bea3e2dc7505231c55bd1adf193 Mon Sep 17 00:00:00 2001
+From c8f82a485887fff61743f6612812d7b66e9ebe6d 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
@@ -2575,7 +2575,7 @@ index a6924e3401e8..3ed02216251b 100644
  M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:	platform-driver-x86@vger.kernel.org
 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
-index 3e882b1e1f74..277353eaeb36 100644
+index 0c513c8bbd2b..c50e8596b440 100644
 --- a/drivers/platform/x86/Kconfig
 +++ b/drivers/platform/x86/Kconfig
 @@ -807,6 +807,31 @@ config INTEL_CHT_INT33FE
@@ -2611,7 +2611,7 @@ index 3e882b1e1f74..277353eaeb36 100644
  	tristate "INTEL HID Event"
  	depends on ACPI
 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
-index 2009224dcaae..e92538799514 100644
+index f552cbfb7914..dd8fc06b224c 100644
 --- a/drivers/platform/x86/Makefile
 +++ b/drivers/platform/x86/Makefile
 @@ -79,6 +79,11 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
@@ -3484,9 +3484,9 @@ index 000000000000..3fe27ec0caff
 +	return ret;
 +}
 -- 
-2.30.0
+2.30.1
 
-From 48a351bcbdc02836cc22bc4cc3ef0747e40d32e9 Mon Sep 17 00:00:00 2001
+From 0564d5c307f712e18fffa6816cb0853c1e6a1224 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
@@ -3554,9 +3554,9 @@ index 745a4e0c4994..87e45a800919 100644
  
  /**
 -- 
-2.30.0
+2.30.1
 
-From 439048a506f3de2b24bfb91db533c1c0ea285c7a Mon Sep 17 00:00:00 2001
+From 8fea36502f89e914226e1159c094b83d9ec3d226 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
@@ -6911,9 +6911,9 @@ index 000000000000..9a508e1f3624
 +static unsigned long N_RES = N_RES_VIDEO;
 +#endif
 -- 
-2.30.0
+2.30.1
 
-From 843d1cc14679a508d76685d653ffb9797f5e9e1f Mon Sep 17 00:00:00 2001
+From 73624b0f335955c8cc097bdbdffe954bc5466c75 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
@@ -6952,9 +6952,9 @@ index 32485e4ed42b..f9ced52ad37a 100644
  
  	if (dev->indicator_led)
 -- 
-2.30.0
+2.30.1
 
-From 21af55c2dce8dc03a49944ae311aaf9ce9a794a0 Mon Sep 17 00:00:00 2001
+From f3982cd7cf3ec7bca291cfc821c4d5dedd94d7ac 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
@@ -6981,5 +6981,5 @@ index f9ced52ad37a..9fd44a3d1d85 100644
  	clk_disable_unprepare(dev->clk);
  
 -- 
-2.30.0
+2.30.1
 

pkg/arch/kernel/PKGBUILD

@@ -45,18 +45,18 @@ validpgpkeys=(
 )
 sha256sums=('8d2c3d8fc7b382c3db6b8bacbc7785e164150b952e706350f2a5a88d42939cb4'
             '47a5c0cbe4f75e77fe64953b516a6a9f277c1dfb812e31edf5cb25feb1b3819a'
-            '1ad719eb0d2eea4e364894b71199ee694c23b44269d1e5e9f4fc341fdf09b991'
+            '3fbd134c61de6f4fa86567bb0faf02c4eb2c54111b6dc45367b8f6e9ef06556e'
             '8cd2b019aac6d3807a5cdcbbbe0aad81e63193ff3e8dffd7a79d4a1421b858f6'
-            '4ce28ed4c0387a44c7f0cf8a28d8b17cbc9a9be037d5d1b2a4cba07bc2a76712'
-            'ba6d197064c41b1e547fa8c86ff11380a7c9177cfbdfd1efe8501e358979ee81'
-            '8982c023f5a5d85052eaa3e78988dcd4b492cbea8a8a61c409e944e55f4e720f'
-            'bc77b1ec74301dec34c9d3b2cdc2df21f458f9e338f6107f4b0c1c91e4e8163a'
-            'daba63b194d4106d8ad5deb15053960ceb87d0f21ecc740c2cb5ed010b7f342a'
-            '66481ae447822b88a1186fb9f47711a90d9a1786133ad1755adb524fb6c6e3e4'
-            'fb6712bef9c309af8cd137a8bdce2dc886521e0a6d3217cdaea7ac7e3d63aa44'
-            'd6df043772f2e1dc21dce74ff805a64ad19de9154d0d8d8c12f4fe982c883554'
-            '0e595489ed968d6db9ac37c1c6dd141328d1317fe52425a25434ee783d51994c'
-            'f78ca3696110fe4256ccb8e1795a26f58f0776ce6ca0a5b69a13c711bc03bca6')
+            'eca6f81db4efc8d71a4f5dbaf1d6ca5b46202cb9a8ef5a7eff6b0bbe26a34a82'
+            'a10905d215739fa148870e0a8fff03f3d101f48d1f7b8028e5460adfd1b8ac25'
+            '84438dad91d0375bf1c80859081e6b10d5fe9ce3127fed654d64a56aad820b13'
+            '34aab05229d9fb782ac8dad4ac411cfd7a4f24509ba385461997e1d40000153c'
+            'e04a672f6bec169d37ee6584c5f1aa252277af1cd38b322eb70602e5bcaeae4d'
+            '8510597e396b72f898e58abcb77b6d356627720741a76d2551aeb0df4af5919f'
+            'a6653fdaa655ee61dbc8118458a844fc9261ef2f2733b8ad83adda02cfbd65b2'
+            'a9f815bc52a2610b3f0b8f878f564acab1d437ac20b7d83790cc7f67d644522f'
+            '16a0d17039426b4c5fb27fb13de0a4dc0b5fb42cacc5100c99b610b0571b8a86'
+            '3645b929503176a4ea671d47ac2b3a5bf6f2bd517b54d848d93934b049a9d0aa')
 
 
 export KBUILD_BUILD_HOST=archlinux