4.14-stable patches

added patches:
	usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index 2f5bb516f4734e54f69b8b4640d212dbea24741f..c06af3c5ef9ccf53c59002d498e8c7ce67831b64 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -59,3 +59,4 @@ docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
 exit-use-read_once-for-all-oops-warn-limit-reads.patch
 mm-kvmalloc-does-not-fallback-to-vmalloc-for-incompatible-gfp-flags.patch
 ipv6-ensure-sane-device-mtu-in-tunnels.patch
+usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch

diff --git a/queue-4.14/usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch b/queue-4.14/usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch
new file mode 100644 (file)
index 0000000..a58583a
--- /dev/null
+++ b/queue-4.14/usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch
@@ -0,0 +1,35 @@
+From 4bb4fc0dbfa23acab9b762949b91ffd52106fe4b Mon Sep 17 00:00:00 2001
+From: Peter Chen <peter.chen@nxp.com>
+Date: Fri, 18 Sep 2020 16:17:47 +0300
+Subject: usb: host: xhci-plat: add wakeup entry at sysfs
+
+From: Peter Chen <peter.chen@nxp.com>
+
+commit 4bb4fc0dbfa23acab9b762949b91ffd52106fe4b upstream.
+
+With this change, there will be a wakeup entry at /sys/../power/wakeup,
+and the user could use this entry to choose whether enable xhci wakeup
+features (wake up system from suspend) or not.
+
+Tested-by: Matthias Kaehlcke <mka@chromium.org>
+Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
+Signed-off-by: Peter Chen <peter.chen@nxp.com>
+Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
+Link: https://lore.kernel.org/r/20200918131752.16488-6-mathias.nyman@linux.intel.com
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/host/xhci-plat.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -252,7 +252,7 @@ static int xhci_plat_probe(struct platfo
+                       *priv = *priv_match;
+       }
+ 
+-      device_wakeup_enable(hcd->self.controller);
++      device_set_wakeup_capable(&pdev->dev, true);
+ 
+       xhci->clk = clk;
+       xhci->main_hcd = hcd;