4.14-stable patches

added patches:
	i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch
	input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch
	input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch

diff --git a/queue-4.14/i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch b/queue-4.14/i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch
new file mode 100644 (file)
index 0000000..4f63442
--- /dev/null
+++ b/queue-4.14/i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch
@@ -0,0 +1,31 @@
+From e1b9f99ff8c40bba6e59de9ad4a659447b1e4112 Mon Sep 17 00:00:00 2001
+From: Chuhong Yuan <hslester96@gmail.com>
+Date: Mon, 4 Nov 2019 23:00:48 +0800
+Subject: i2c: hix5hd2: add missed clk_disable_unprepare in remove
+
+From: Chuhong Yuan <hslester96@gmail.com>
+
+commit e1b9f99ff8c40bba6e59de9ad4a659447b1e4112 upstream.
+
+The driver forgets to disable and unprepare clk when remove.
+Add a call to clk_disable_unprepare to fix it.
+
+Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Cc: stable@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/i2c/busses/i2c-hix5hd2.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/i2c/busses/i2c-hix5hd2.c
++++ b/drivers/i2c/busses/i2c-hix5hd2.c
+@@ -498,6 +498,7 @@ static int hix5hd2_i2c_remove(struct pla
+       i2c_del_adapter(&priv->adap);
+       pm_runtime_disable(priv->dev);
+       pm_runtime_set_suspended(priv->dev);
++      clk_disable_unprepare(priv->clk);
+ 
+       return 0;
+ }

diff --git a/queue-4.14/input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch b/queue-4.14/input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch
new file mode 100644 (file)
index 0000000..a8326ed
--- /dev/null
+++ b/queue-4.14/input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch
@@ -0,0 +1,52 @@
+From 52afa505a03d914081f40cb869a3248567a57573 Mon Sep 17 00:00:00 2001
+From: Eugene Syromiatnikov <esyr@redhat.com>
+Date: Tue, 24 Mar 2020 15:53:50 -0700
+Subject: Input: avoid BIT() macro usage in the serio.h UAPI header
+
+From: Eugene Syromiatnikov <esyr@redhat.com>
+
+commit 52afa505a03d914081f40cb869a3248567a57573 upstream.
+
+The commit 19ba1eb15a2a ("Input: psmouse - add a custom serio protocol
+to send extra information") introduced usage of the BIT() macro
+for SERIO_* flags; this macro is not provided in UAPI headers.
+Replace if with similarly defined _BITUL() macro defined
+in <linux/const.h>.
+
+Fixes: 19ba1eb15a2a ("Input: psmouse - add a custom serio protocol to send extra information")
+Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
+Cc: <stable@vger.kernel.org> # v5.0+
+Link: https://lore.kernel.org/r/20200324041341.GA32335@asgard.redhat.com
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/serio.h |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/include/uapi/linux/serio.h
++++ b/include/uapi/linux/serio.h
+@@ -9,7 +9,7 @@
+ #ifndef _UAPI_SERIO_H
+ #define _UAPI_SERIO_H
+ 
+-
++#include <linux/const.h>
+ #include <linux/ioctl.h>
+ 
+ #define SPIOCSTYPE    _IOW('q', 0x01, unsigned long)
+@@ -18,10 +18,10 @@
+ /*
+  * bit masks for use in "interrupt" flags (3rd argument)
+  */
+-#define SERIO_TIMEOUT BIT(0)
+-#define SERIO_PARITY  BIT(1)
+-#define SERIO_FRAME   BIT(2)
+-#define SERIO_OOB_DATA        BIT(3)
++#define SERIO_TIMEOUT _BITUL(0)
++#define SERIO_PARITY  _BITUL(1)
++#define SERIO_FRAME   _BITUL(2)
++#define SERIO_OOB_DATA        _BITUL(3)
+ 
+ /*
+  * Serio types

diff --git a/queue-4.14/input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch b/queue-4.14/input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch
new file mode 100644 (file)
index 0000000..2efedd8
--- /dev/null
+++ b/queue-4.14/input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch
@@ -0,0 +1,34 @@
+From 1369d0abe469fb4cdea8a5bce219d38cb857a658 Mon Sep 17 00:00:00 2001
+From: Yussuf Khalil <dev@pp3345.net>
+Date: Sat, 7 Mar 2020 14:16:31 -0800
+Subject: Input: synaptics - enable RMI on HP Envy 13-ad105ng
+
+From: Yussuf Khalil <dev@pp3345.net>
+
+commit 1369d0abe469fb4cdea8a5bce219d38cb857a658 upstream.
+
+This laptop (and perhaps other variants of the same model) reports an
+SMBus-capable Synaptics touchpad. Everything (including suspend and
+resume) works fine when RMI is enabled via the kernel command line, so
+let's add it to the whitelist.
+
+Signed-off-by: Yussuf Khalil <dev@pp3345.net>
+Link: https://lore.kernel.org/r/20200307213508.267187-1-dev@pp3345.net
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/mouse/synaptics.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -189,6 +189,7 @@ static const char * const smbus_pnp_ids[
+       "SYN3052", /* HP EliteBook 840 G4 */
+       "SYN3221", /* HP 15-ay000 */
+       "SYN323d", /* HP Spectre X360 13-w013dx */
++      "SYN3257", /* HP Envy 13-ad105ng */
+       NULL
+ };
+ 

diff --git a/queue-4.14/series b/queue-4.14/series
index 5968dd17fd2e84d630deaf4ea8149f156931d8e0..dbba4ee4b981c2aae5e77aa31716002516695bfb 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -86,3 +86,6 @@ sxgbe-fix-off-by-one-in-samsung-driver-strncpy-size-.patch
 arm64-ptrace-map-spsr_elx-psr-for-compat-tasks.patch
 arm64-compat-map-spsr_elx-psr-for-signals.patch
 ftrace-x86-anotate-text_mutex-split-between-ftrace_arch_code_modify_post_process-and-ftrace_arch_code_modify_prepare.patch
+i2c-hix5hd2-add-missed-clk_disable_unprepare-in-remove.patch
+input-synaptics-enable-rmi-on-hp-envy-13-ad105ng.patch
+input-avoid-bit-macro-usage-in-the-serio.h-uapi-header.patch