surface-acpi: SID support for AC/Battery and HID

Add support for Surface Laptop 3 keyboard as well as Surface Laptop 3
and Surface Pro 7 Battery/AC.

patches/4.19/0002-suspend.patch

@@ -1,4 +1,4 @@
-From 72d79d0550297c99c692cfc15f761a8abfc3451a Mon Sep 17 00:00:00 2001
+From a0440209503a70ceba6353b40ab335528c7f7663 Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Sat, 28 Sep 2019 17:48:21 +0200
 Subject: [PATCH 02/13] suspend
@@ -14,10 +14,10 @@ Subject: [PATCH 02/13] suspend
  7 files changed, 182 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 5d0f99bcc987..e2440dcda5a7 100644
+index c4ff4f079448..4e050ae8a6d4 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
-@@ -1031,15 +1031,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
+@@ -1049,15 +1049,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
  	return id;
  }
  
@@ -36,7 +36,7 @@ index 5d0f99bcc987..e2440dcda5a7 100644
  	c.features.fid = cpu_to_le32(fid);
  	c.features.dword11 = cpu_to_le32(dword11);
  
-@@ -1050,6 +1050,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword
+@@ -1068,6 +1068,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword
  	return ret;
  }
  
@@ -61,7 +61,7 @@ index 5d0f99bcc987..e2440dcda5a7 100644
  int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
  {
  	u32 q_count = (*count - 1) | ((*count - 1) << 16);
-@@ -3565,6 +3583,18 @@ static void nvme_free_ctrl(struct device *dev)
+@@ -3584,6 +3602,18 @@ static void nvme_free_ctrl(struct device *dev)
  		nvme_put_subsystem(subsys);
  }
  
@@ -81,10 +81,10 @@ index 5d0f99bcc987..e2440dcda5a7 100644
   * Initialize a NVMe controller structures.  This needs to be called during
   * earliest initialization so that we have the initialized structured around
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 2653e1f4196d..3bcd14a28e32 100644
+index cc4273f11989..40192b661798 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
-@@ -433,6 +433,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
+@@ -436,6 +436,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
  void nvme_stop_queues(struct nvme_ctrl *ctrl);
  void nvme_start_queues(struct nvme_ctrl *ctrl);
  void nvme_kill_queues(struct nvme_ctrl *ctrl);
@@ -92,7 +92,7 @@ index 2653e1f4196d..3bcd14a28e32 100644
  void nvme_unfreeze(struct nvme_ctrl *ctrl);
  void nvme_wait_freeze(struct nvme_ctrl *ctrl);
  void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
-@@ -450,6 +451,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
+@@ -453,6 +454,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
  		union nvme_result *result, void *buffer, unsigned bufflen,
  		unsigned timeout, int qid, int at_head,
  		blk_mq_req_flags_t flags);
@@ -106,7 +106,7 @@ index 2653e1f4196d..3bcd14a28e32 100644
  void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
  int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
 diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index a64a8bca0d5b..8ab9abfd68b0 100644
+index 124f41157173..288ae6bf6213 100644
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
 @@ -26,6 +26,7 @@
@@ -125,7 +125,7 @@ index a64a8bca0d5b..8ab9abfd68b0 100644
  
  	mempool_t *iod_mempool;
  
-@@ -2267,6 +2269,7 @@ static void nvme_reset_work(struct work_struct *work)
+@@ -2269,6 +2271,7 @@ static void nvme_reset_work(struct work_struct *work)
  	 */
  	if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)
  		nvme_dev_disable(dev, false);
@@ -133,7 +133,7 @@ index a64a8bca0d5b..8ab9abfd68b0 100644
  
  	mutex_lock(&dev->shutdown_lock);
  	result = nvme_pci_enable(dev);
-@@ -2606,16 +2609,101 @@ static void nvme_remove(struct pci_dev *pdev)
+@@ -2608,16 +2611,101 @@ static void nvme_remove(struct pci_dev *pdev)
  }
  
  #ifdef CONFIG_PM_SLEEP
@@ -236,7 +236,7 @@ index a64a8bca0d5b..8ab9abfd68b0 100644
  {
  	struct pci_dev *pdev = to_pci_dev(dev);
  	struct nvme_dev *ndev = pci_get_drvdata(pdev);
-@@ -2623,9 +2711,16 @@ static int nvme_resume(struct device *dev)
+@@ -2625,9 +2713,16 @@ static int nvme_resume(struct device *dev)
  	nvme_reset_ctrl(&ndev->ctrl);
  	return 0;
  }
@@ -255,7 +255,7 @@ index a64a8bca0d5b..8ab9abfd68b0 100644
  
  static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
  						pci_channel_state_t state)
-@@ -2728,9 +2823,11 @@ static struct pci_driver nvme_driver = {
+@@ -2730,9 +2825,11 @@ static struct pci_driver nvme_driver = {
  	.probe		= nvme_probe,
  	.remove		= nvme_remove,
  	.shutdown	= nvme_shutdown,

patches/4.19/0003-buttons.patch

@@ -1,4 +1,4 @@
-From d2ed5a214ade3002d97b49eb6630b4c329882144 Mon Sep 17 00:00:00 2001
+From f3c4fbbf4bd7222199fff5162a0f790414b7ca29 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Jul 2019 17:51:37 +0200
 Subject: [PATCH 03/13] buttons

patches/4.19/0004-cameras.patch

@@ -1,4 +1,4 @@
-From 7383c8003f2be97706b1c81539d89524cb7b91dc Mon Sep 17 00:00:00 2001
+From 215d8d4ae78f1bfaebdc0fb6b56f2a2e3b0b61b3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 17:53:54 +0200
 Subject: [PATCH 04/13] cameras
@@ -21,10 +21,10 @@ Subject: [PATCH 04/13] cameras
  create mode 100644 drivers/staging/ov5693/ov5693.h
 
 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index c3ddbf6c202a..15143bbef860 100644
+index cf4feff2a48c..db24e360f6ab 100644
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2365,6 +2365,46 @@ static const struct uvc_device_info uvc_quirk_force_y8 = {
+@@ -2367,6 +2367,46 @@ static const struct uvc_device_info uvc_quirk_force_y8 = {
   * though they are compliant.
   */
  static const struct usb_device_id uvc_ids[] = {

patches/4.19/0005-ipts.patch

@@ -1,4 +1,4 @@
-From ab3f832b549844f25e9a4b8bb0ae68b2e1f6a596 Mon Sep 17 00:00:00 2001
+From 678ce41480476ac90e3951e055cfd6448b9d95d6 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 17:58:17 +0200
 Subject: [PATCH 05/13] ipts
@@ -189,7 +189,7 @@ index e063e98d1e82..32d648c8adc5 100644
  
  int i915_debugfs_register(struct drm_i915_private *dev_priv)
 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index a4b4ab7b9f8e..19a1d35c2315 100644
+index b0d76a7a0946..7598616d9122 100644
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
 @@ -53,6 +53,7 @@
@@ -221,10 +221,10 @@ index a4b4ab7b9f8e..19a1d35c2315 100644
  
  	if (i915_gem_suspend(dev_priv))
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d6c25bea4382..d6b507fb7626 100644
+index db2e9af49ae6..99bc0c92c411 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -3213,6 +3213,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
+@@ -3232,6 +3232,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
  void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
  					 struct sg_table *pages);
  
@@ -235,10 +235,10 @@ index d6c25bea4382..d6b507fb7626 100644
  __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id)
  {
 diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
-index b10770cfccd2..0222f0a55262 100644
+index 7a0e6dbbad2e..e805c1de54f6 100644
 --- a/drivers/gpu/drm/i915/i915_gem_context.c
 +++ b/drivers/gpu/drm/i915/i915_gem_context.c
-@@ -467,6 +467,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915)
+@@ -472,6 +472,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915)
  	return HAS_LOGICAL_RING_PREEMPTION(i915);
  }
  
@@ -6722,7 +6722,7 @@ index 000000000000..9c34b55ff036
 +
 +#endif // _IPTS_H_
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index f85aa3f4042d..2daace422dce 100644
+index 9c4042420022..5d63ebba3e9f 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -119,6 +119,7 @@
@@ -6734,7 +6734,7 @@ index f85aa3f4042d..2daace422dce 100644
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 28cdd87851cb..c13ba550435c 100644
+index 41a10e392839..2b93a067cebc 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -86,6 +86,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {

patches/4.19/0006-hid.patch

@@ -1,4 +1,4 @@
-From 5490c8ebc9bc750c1d2175153dce6acf83632c70 Mon Sep 17 00:00:00 2001
+From 24943eb655f03a88c39295916dd25bf5a53cc933 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
 Date: Wed, 6 Nov 2019 19:43:26 +0900
 Subject: [PATCH 06/13] hid
@@ -8,10 +8,10 @@ Subject: [PATCH 06/13] hid
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 63a1628f7cf7..1ac8a38ccd0b 100644
+index b0c8fae7f903..3a359716fb38 100644
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
-@@ -741,6 +741,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage)
+@@ -780,6 +780,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage)
  	if (usage == 0xff0000c5 && parser->global.report_count == 256 &&
  	    parser->global.report_size == 8)
  		parser->scan_flags |= HID_SCAN_FLAG_MT_WIN_8;

patches/4.19/0007-sdcard-reader.patch

@@ -1,4 +1,4 @@
-From f69368161b311a9074083a383aaf3fdd141c8986 Mon Sep 17 00:00:00 2001
+From 9bb4a6a8a1aef64e4fcaa3527108b8e6da35e845 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 17:59:13 +0200
 Subject: [PATCH 07/13] sdcard-reader

patches/4.19/0008-wifi.patch

@@ -1,4 +1,4 @@
-From 9f93486c38736271a44d2109587e6ca4bf7f9f63 Mon Sep 17 00:00:00 2001
+From facdc3529e5ee42e976484f1a5e824867e5bb3df Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:00:19 +0200
 Subject: [PATCH 08/13] wifi
@@ -33,10 +33,10 @@ index 042a1d07f686..fc9041f58e9f 100644
  
  		skb_src = skb_dequeue(&pra_list->skb_head);
 diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-index 47ec5293c045..435c346116a2 100644
+index 7b74ef71bef1..f0d1b0d48e07 100644
 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
 +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-@@ -428,7 +428,10 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
+@@ -437,7 +437,10 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
  		mwifiex_dbg(priv->adapter, INFO,
  			    "info: ignore timeout value for IEEE Power Save\n");
  
@@ -250,7 +250,7 @@ index 69e3b624adbb..884bad677cc3 100644
  	if (adapter->curr_cmd->wait_q_enabled)
  		adapter->cmd_wait_q.status = -1;
 diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
-index 433c6a16870b..a2ff1ee3d230 100644
+index d445acc4786b..ae8e60cc17cb 100644
 --- a/drivers/net/wireless/marvell/mwifiex/usb.c
 +++ b/drivers/net/wireless/marvell/mwifiex/usb.c
 @@ -144,6 +144,8 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter,

patches/4.19/0009-surface3-power.patch

@@ -1,4 +1,4 @@
-From 719efb921bbd3822c3cacbc35341a2f5e058a9ad Mon Sep 17 00:00:00 2001
+From 310f0563c32936e54eb60e9e2e2ad2280b7f7208 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:00:43 +0200
 Subject: [PATCH 09/13] surface3-power

patches/4.19/0010-mwlwifi.patch

@@ -1,4 +1,4 @@
-From e6d6852f3d764e65c606b6234429c695b597bd80 Mon Sep 17 00:00:00 2001
+From 64a2a0f032a96a09ee29d63e510f83834b6aa88e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:01:27 +0200
 Subject: [PATCH 10/13] mwlwifi

patches/4.19/0011-surface-lte.patch

@@ -1,4 +1,4 @@
-From d34e66e05dcb416d8185feaa111e2b3a90a74f7d Mon Sep 17 00:00:00 2001
+From a9414a3a06df5074fa44c920857104e9eb8f8031 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:02:03 +0200
 Subject: [PATCH 11/13] surface-lte

patches/4.19/0012-surfacebook2-dgpu.patch

@@ -1,4 +1,4 @@
-From 458ecef20fa6a73af94c14abbe4da257cec9ad64 Mon Sep 17 00:00:00 2001
+From cc366ca006cf7e176d5edfa17c12d844701f543d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 28 Sep 2019 18:02:33 +0200
 Subject: [PATCH 12/13] surfacebook2-dgpu

patches/4.19/0013-ioremap_uc.patch

@@ -1,4 +1,4 @@
-From c2e0f66b7c9a2100bfc84a2572ecef338f27d603 Mon Sep 17 00:00:00 2001
+From 45a30685cf30d7ea4f07d6b3a86aac80feccf32d Mon Sep 17 00:00:00 2001
 From: Tuowen Zhao <ztuowen@gmail.com>
 Date: Wed, 16 Oct 2019 15:06:27 -0600
 Subject: [PATCH 13/13] ioremap_uc

patches/5.3/0002-buttons.patch

@@ -1,4 +1,4 @@
-From 9e593d5069d62e2ce0ba912a6133a3856d76a7be Mon Sep 17 00:00:00 2001
+From d836ba289ea5db5f1cee4dbc6c9d01221a485dfb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Jul 2019 17:51:37 +0200
 Subject: [PATCH 02/10] buttons

patches/5.3/0003-surfacebook2-dgpu.patch

@@ -1,4 +1,4 @@
-From dcf9552649950a89bcda5cb654291bd72f56ba82 Mon Sep 17 00:00:00 2001
+From 84256bec041bd435d4413fc07841a103c7335583 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 2 Jul 2019 22:17:46 +0200
 Subject: [PATCH 03/10] surfacebook2-dgpu

patches/5.3/0004-hid.patch

@@ -1,4 +1,4 @@
-From ba41efff33ac23f118d1bc6eb21745d0003c9e6e Mon Sep 17 00:00:00 2001
+From 4d565b178d767e637429bfe12feeda48cddf1484 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
 Date: Wed, 6 Nov 2019 19:43:26 +0900
 Subject: [PATCH 04/10] hid
@@ -8,10 +8,10 @@ Subject: [PATCH 04/10] hid
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 3af76624e4aa..551eabc9528a 100644
+index 12149c5c39e4..dea1f9139b5c 100644
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
-@@ -742,6 +742,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage)
+@@ -781,6 +781,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage)
  	if (usage == 0xff0000c5 && parser->global.report_count == 256 &&
  	    parser->global.report_size == 8)
  		parser->scan_flags |= HID_SCAN_FLAG_MT_WIN_8;

patches/5.3/0005-surface3-power.patch

@@ -1,4 +1,4 @@
-From b224f8a7da4e4614a3cf4540326777b3ea36f222 Mon Sep 17 00:00:00 2001
+From 01219c3aed6f2f1887c4abeac02e90db353fd922 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Tue, 17 Sep 2019 17:17:56 +0200
 Subject: [PATCH 05/10] surface3-power

patches/5.3/0006-surface-lte.patch

@@ -1,4 +1,4 @@
-From bfbd2601374d091a6af5fa16406fe1eccf7f2c53 Mon Sep 17 00:00:00 2001
+From 0e6c9d5398a6d2254c6d595112b234e222637a8b Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Tue, 17 Sep 2019 17:21:43 +0200
 Subject: [PATCH 06/10] surface-lte

patches/5.3/0007-wifi.patch

@@ -1,4 +1,4 @@
-From d4cb98022b8cace0fba9fa4a1b48900dea9959c2 Mon Sep 17 00:00:00 2001
+From 2e405d90dc591416b6e1aebaeba84cb09e317f07 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Wed, 18 Sep 2019 03:18:25 +0200
 Subject: [PATCH 07/10] wifi

patches/5.3/0008-legacy-i915.patch

@@ -1,4 +1,4 @@
-From d5d5c14e03ba1a73522f1a90d1d1b982c6c41ccb Mon Sep 17 00:00:00 2001
+From 53a9de609c3ffeb174f9551c221d4a63d1d15542 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 16 Sep 2019 04:10:51 +0200
 Subject: [PATCH 08/10] legacy-i915

patches/5.3/0009-ipts.patch

@@ -1,4 +1,4 @@
-From 3003516f7532d3e7c22b54e3a1d20fb7bebd975c Mon Sep 17 00:00:00 2001
+From 415661df64a887487ef496afaf38ec7a36833d0d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 18 Sep 2019 13:04:18 +0200
 Subject: [PATCH 09/10] ipts
@@ -7104,7 +7104,7 @@ index 000000000000..ef73d28db47c
 +
 +#endif // _IPTS_STATE_H_
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index c09f8bb49495..a3740901988e 100644
+index b359f06f05e7..4ddfc8771611 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -59,6 +59,7 @@
@@ -7116,7 +7116,7 @@ index c09f8bb49495..a3740901988e 100644
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 3a2eadcd0378..28973f96f956 100644
+index b1c518abc10e..30506fbf187c 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -77,6 +77,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {

patches/5.3/0010-ioremap_uc.patch

@@ -1,4 +1,4 @@
-From bcda20426593c94a83e109c410d7505e1174eb96 Mon Sep 17 00:00:00 2001
+From 441b6e5c8fbe40ec9858147a521a5bb192160d49 Mon Sep 17 00:00:00 2001
 From: Tuowen Zhao <ztuowen@gmail.com>
 Date: Wed, 16 Oct 2019 15:06:27 -0600
 Subject: [PATCH 10/10] ioremap_uc