Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp1683333ybg; Wed, 29 Jul 2020 23:06:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEyhuu9AnIq/o5Cz+wXx/oVD3xtXYad94BcCe5N1Prfy8NXlOwX49B2cvxi9YTZ2KGNTNp X-Received: by 2002:aa7:d90f:: with SMTP id a15mr1112146edr.86.1596089199507; Wed, 29 Jul 2020 23:06:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596089199; cv=none; d=google.com; s=arc-20160816; b=J/MGKwugTkVsmpUnLorwrj/hNsEbtYEvF1iBPFJEEU+lrg3NpbsG5t0F0XEzcpyy0d GEfifoYD4bXmP1yrcQcOqklTC3AIMHH977ra4FPqqAOxL5SsQPULzPtiMSOLg3YVOcUW I5lMQxNYZSDpOMxwhAX5IaVaSwNG/R2lwhjdF9ovTvvlPJ104aJN53Qj7g9vZjWbU2Zx 1kNSvUvs7WZgU5/IZEBxhIiN4tIyCle6Jb4WuBQ8XDdpqSjSPhjZ3JRtY0j0dyZ7uDeh VLxUopV7OLLKXwoAbgFVdIHthrCGwZr+DZl8f8ZVNVvmF+l2mxAEQOFvh0TFXLjAyLaZ dpzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=qZhSwEuYFuR25kmXE/ZASQLaLCJxrKZRAKpTESzihmo=; b=sWkwmuzgrvILDnF/taSFNhGgyUJDtJ617ncH4rdv3quyQgd5JxVjjmnG1sK1ms6JZ7 DOSIswi6YNqgfdm6570bnYoyOWTAHSqeW6l54rvpbUKQxUmBA1qpXbv2G+o3uTzkChFQ yo9dN0PLqlAS1wvzoCsE68Lk5IdCupUB/lh5nvcW7NrJ5gEviz8EtvbZ9KlLx3Bt/MrR CpTuBsdeNkz013petCuyHpL+R5eqYZFa+6nm6L8jcs821mfjyfFYQ4cd3xn9V5ZKYV1G VqySt0BUKV7B3YQ3mAa+zJYh9xY4SUVmb6UBiPV3XSkAbvkVvZDidVihJw3SDE/1CEhj dnuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l30si2636783ede.587.2020.07.29.23.06.17; Wed, 29 Jul 2020 23:06:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728670AbgG3GFf (ORCPT + 99 others); Thu, 30 Jul 2020 02:05:35 -0400 Received: from emcscan.emc.com.tw ([192.72.220.5]:8771 "EHLO emcscan.emc.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725892AbgG3GFe (ORCPT ); Thu, 30 Jul 2020 02:05:34 -0400 X-IronPort-AV: E=Sophos;i="5.56,253,1539619200"; d="scan'208";a="36653720" Received: from unknown (HELO webmail.emc.com.tw) ([192.168.10.1]) by emcscan.emc.com.tw with ESMTP; 30 Jul 2020 14:05:32 +0800 Received: from 192.168.10.23 by webmail.emc.com.tw with MailAudit ESMTP Server V5.0(38947:0:AUTH_RELAY) (envelope-from ); Thu, 30 Jul 2020 14:05:30 +0800 (CST) Received: from 49.216.132.207 by webmail.emc.com.tw with Mail2000 ESMTPA Server V7.00(2485:0:AUTH_LOGIN) (envelope-from ); Thu, 30 Jul 2020 14:05:30 +0800 (CST) From: Jingle Wu To: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com Cc: phoenix@emc.com.tw, josh.chen@emc.com.tw, dave.wang@emc.com.tw, kai.heng.feng@canonical.com, Jingle Wu Subject: [PATCH] Input: elan_i2c - Add ic type 0x15. Date: Thu, 30 Jul 2020 02:05:26 -0400 Message-Id: <20200730060526.12439-1-jingle.wu@emc.com.tw> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The update firmware flow of ic type 0x15 is same with ic type 0x14. Signed-off-by: Jingle Wu --- drivers/input/mouse/elan_i2c_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 8a0f224da423..c599e21a8478 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -138,6 +138,7 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count, *validpage_count = 2048; break; case 0x14: + case 0x15: *validpage_count = 1024; break; default: @@ -151,7 +152,7 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count, *signature_address = (*validpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE; - if (ic_type == 0x14 && iap_version >= 2) { + if ((ic_type == 0x14 || ic_type == 0x15) && iap_version >= 2) { *validpage_count /= 8; *page_size = ETP_FW_PAGE_SIZE_512; } else if (ic_type >= 0x0D && iap_version >= 1) { -- 2.17.1