From patchwork Mon Jun 6 11:23:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 9157895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9BC2060759 for ; Mon, 6 Jun 2016 11:25:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D4E9267EC for ; Mon, 6 Jun 2016 11:25:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81E8026E5D; Mon, 6 Jun 2016 11:25:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A752267EC for ; Mon, 6 Jun 2016 11:25:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751513AbcFFLZZ (ORCPT ); Mon, 6 Jun 2016 07:25:25 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34878 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbcFFLY2 (ORCPT ); Mon, 6 Jun 2016 07:24:28 -0400 Received: by mail-wm0-f68.google.com with SMTP id k184so9267030wme.2; Mon, 06 Jun 2016 04:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bXV6hIfucdtTyoNFgJhyXfs8J5bTvCeEOrb9MDxDQuU=; b=dhF58UOonCc7uFxJ1UEdmrUK9IvCrTPAtOGOczjgqu9H/2ZypXwPpfQGqmWuyJyH65 UQEnna4u8ymX/Fk4JDOMYm7duiJrEZggIBmNm8xOnHYWJxvxZLzYHe/Xc9hpzSSTjIs1 WU4KBYuEtSY787tY9ryAzA/5nFmBZgFa+pqTzbUAra/BDrTJHjJlbWsVOpx6kpG33vQe eKCfCTD5SlnzhEBg7AKi3Xg+mgzezd7Ixt8lE/Ws2FDLrT78swBnDq8qEMzXA/4QsDJs mAQjXFM9PsWJNGvEcl7LrNuFifPspj5EwXrn8qDAsEYA6g0sNsvz7ICkIx/8OA+ziOMO nDqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bXV6hIfucdtTyoNFgJhyXfs8J5bTvCeEOrb9MDxDQuU=; b=P3bu5rs3s+l+b4EqQrnFI90FGENVqNZqE6MrAv2/rhc076qcZTTOVbvJT+UzJ6BxSN rDHzP/Yzul0ck1kFAq/TGqHHhEATPmDHaPM7cjK4ffNWnDjlHF2dXm64akFqFLLKt2aE gomcCRlE69V0EsCjDSBUR540jnQmuDZa1NqobhuUKhzhYWDPZn8eOuU2zhcBkvhM/yvU UkbznbYH8RvXxArpFNnS5nFmJunz00mubxVJ4Y9RVsiccrDsowvKKlmORjOMO6HRurr8 7+TEA0R6UoOw+4hnhdWu36mJEGfurlSkJx8QsGYSMXg/E2nO9zoFGQYzKPewKUxmdgA4 aaJA== X-Gm-Message-State: ALyK8tKWDH8RC7GNBoId7XQR5gk56TbnsYmDz9w7HToJVaenXcJw+QKLf+HOLnpF+k6/Pw== X-Received: by 10.28.218.10 with SMTP id r10mr10916701wmg.18.1465212266590; Mon, 06 Jun 2016 04:24:26 -0700 (PDT) Received: from Pali-Latitude.lan (pali.kolej.mff.cuni.cz. [78.128.193.202]) by smtp.gmail.com with ESMTPSA id c191sm13765776wmh.5.2016.06.06.04.24.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 04:24:26 -0700 (PDT) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Dmitry Torokhov , Hans de Goede , Ben Gamari Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 2/5] Input: alps - move ALPS_PROTO_V4 out of alps_model_data table Date: Mon, 6 Jun 2016 13:23:58 +0200 Message-Id: <1465212241-14702-3-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1465212241-14702-1-git-send-email-pali.rohar@gmail.com> References: <1465212241-14702-1-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Like for other protocols create alps_v4_protocol_data and use it in alps_identify() function. Signed-off-by: Pali Rohár --- drivers/input/mouse/alps.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index eb0c57b..087fbe5 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -136,7 +136,6 @@ static const struct alps_model_info alps_model_data[] = { { { 0x73, 0x02, 0x50 }, 0x00, { ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS } }, /* Dell Vostro 1400 */ { { 0x52, 0x01, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED } }, /* Toshiba Tecra A11-11L */ - { { 0x73, 0x02, 0x64 }, 0x8a, { ALPS_PROTO_V4, 0x8f, 0x8f, 0 } }, }; static const struct alps_protocol_info alps_v3_protocol_data = { @@ -147,6 +146,10 @@ static const struct alps_protocol_info alps_v3_rushmore_data = { ALPS_PROTO_V3_RUSHMORE, 0x8f, 0x8f, ALPS_DUALPOINT }; +static const struct alps_protocol_info alps_v4_protocol_data = { + ALPS_PROTO_V4, 0x8f, 0x8f, 0 +}; + static const struct alps_protocol_info alps_v5_protocol_data = { ALPS_PROTO_V5, 0xc8, 0xd8, 0 }; @@ -2756,7 +2759,10 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) protocol = alps_match_table(e7, ec); if (!protocol) { - if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 && + if (e7[0] == 0x73 && e7[1] == 0x02 && e7[2] == 0x64 && + ec[2] == 0x8a) { + protocol = &alps_v4_protocol_data; + } else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 && ec[0] == 0x73 && (ec[1] == 0x01 || ec[1] == 0x02)) { protocol = &alps_v5_protocol_data; } else if (e7[0] == 0x73 && e7[1] == 0x00 && e7[2] == 0x14) {