diff --git a/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch b/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch deleted file mode 100644 index 11cc1fe..0000000 --- a/patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch +++ /dev/null @@ -1,41 +0,0 @@ -From patchwork Mon Oct 16 14:48:55 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: Input: synaptics - add Intertouch support on X1 Carbon 6th and X280 -From: Aaron Ma -X-Patchwork-Id: 10008513 -Message-Id: <1508165335-16738-1-git-send-email-aaron.ma@canonical.com> -To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, - dmitry.torokhov@gmail.com, aaron.ma@canonical.com -Date: Mon, 16 Oct 2017 22:48:55 +0800 - -Synaptics devices reported it has Intertouch support, -and it fails via PS/2 as following logs: - -psmouse serio2: Failed to reset mouse on synaptics-pt/serio0 -psmouse serio2: Failed to enable mouse on synaptics-pt/serio0 - -Set these new devices to use SMBus to fix this issue, -then they report SMBus version 3 is using, -patch: https://patchwork.kernel.org/patch/9989547/ enabled SMBus ver 3 and -makes synaptics devices work fine on SMBus mode. - -Signed-off-by: Aaron Ma ---- - drivers/input/mouse/synaptics.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index 5af0b7d200bc..da3a5e40e80c 100644 ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -173,6 +173,8 @@ static const char * const smbus_pnp_ids[] = { - "LEN004a", /* W541 */ - "LEN0073", /* X1 Carbon 5 */ - "LEN200f", /* T450s */ -+ "LEN0092", /* X1 Carbon 6 */ -+ "LEN0096", /* X280 */ - NULL - }; - diff --git a/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch b/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch deleted file mode 100644 index 490baa8..0000000 --- a/patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch +++ /dev/null @@ -1,28 +0,0 @@ -From patchwork Fri Oct 6 14:06:30 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v2,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI -From: Yiannis Marangos -X-Patchwork-Id: 9989549 -Message-Id: <20171006140630.6398-3-yiannis.marangos@gmail.com> -To: linux-input@vger.kernel.org -Cc: Yiannis Marangos -Date: Fri, 6 Oct 2017 17:06:30 +0300 - ---- - drivers/input/mouse/synaptics.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index 5af0b7d200bc..eecb8872c1a5 100644 ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = { - "LEN0048", /* X1 Carbon 3 */ - "LEN0046", /* X250 */ - "LEN004a", /* W541 */ -+ "LEN0073", /* X1 Carbon 5 */ - "LEN200f", /* T450s */ - NULL - }; diff --git a/series.conf b/series.conf index bcc33d0..400d801 100644 --- a/series.conf +++ b/series.conf @@ -24,8 +24,3 @@ patches.xen/pci_op-cleanup.patch # Fix for MSI support with stubdoms patches.xen/xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch - -# Hardware-specific fixes, backported from newer kernel and/or developers branches -patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch -patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch - diff --git a/version b/version index 3c2dee5..0d1d6d7 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.14.41 +4.14.57