From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E91EEC43381 for ; Tue, 12 Mar 2019 17:59:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B36E0214AF for ; Tue, 12 Mar 2019 17:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552413555; bh=GDIA34KxtJwhzW9/pDflH0mibDPAhZksiuaQf8Pt9H8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g8bzFgFkOqyhK0z7Oyj/LZetnFC8tDJ9CU5HEds7TGzbvXXfw2GtE2mpZeooBObrC yzmPsyo4yF1T74GG5Uu1YoZrkrGfJYK9o/fgTqrtzwT9FD0kp14bQpKvBvI19pUiUy V3x2UAQypm1GQYKKz1gQdIxbcp+kIgWWJVPUe91g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728651AbfCLR7H (ORCPT ); Tue, 12 Mar 2019 13:59:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:50844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727984AbfCLRNf (ORCPT ); Tue, 12 Mar 2019 13:13:35 -0400 Received: from localhost (unknown [104.133.8.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 267E221855; Tue, 12 Mar 2019 17:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410815; bh=GDIA34KxtJwhzW9/pDflH0mibDPAhZksiuaQf8Pt9H8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZJ8EPmtuXL4FkXlEIKNKEzxlLlYJTdnkVdI6XpeQNh8kytVBqxH1GXXAda9D8G5G wTfoGUyA0Oh2L3ZTY3Vycfnpv9WD6OoVebqvq12uFtIDk5Lh5Q1ezXhOneeoCQ0BLm 75lltwmh5M6Q+yDYsxeS9CLcBWUMK32brNmvF4CY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Batts , Dmitry Torokhov Subject: [PATCH 4.20 150/171] Input: elan_i2c - add id for touchpad found in Lenovo s21e-20 Date: Tue, 12 Mar 2019 10:08:50 -0700 Message-Id: <20190312170400.461296999@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vincent Batts commit e154ab69321ce2c54f19863d75c77b4e2dc9d365 upstream. Lenovo s21e-20 uses ELAN0601 in its ACPI tables for the Elan touchpad. Signed-off-by: Vincent Batts Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/mouse/elan_i2c_core.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1337,6 +1337,7 @@ static const struct acpi_device_id elan_ { "ELAN0000", 0 }, { "ELAN0100", 0 }, { "ELAN0600", 0 }, + { "ELAN0601", 0 }, { "ELAN0602", 0 }, { "ELAN0605", 0 }, { "ELAN0608", 0 },