From patchwork Mon Jun 6 11:23:57 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: 9157897 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 3F54560759 for ; Mon, 6 Jun 2016 11:25:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3100B27D45 for ; Mon, 6 Jun 2016 11:25:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25D33281BE; Mon, 6 Jun 2016 11:25:51 +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 C16E427D45 for ; Mon, 6 Jun 2016 11:25:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbcFFLY2 (ORCPT ); Mon, 6 Jun 2016 07:24:28 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35889 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751808AbcFFLYZ (ORCPT ); Mon, 6 Jun 2016 07:24:25 -0400 Received: by mail-wm0-f66.google.com with SMTP id m124so14565036wme.3; Mon, 06 Jun 2016 04:24:25 -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=lrkZY0XDsPKEA4Vd4SIU4BTRrSN8Y6Tr/Ts6cuiqHMM=; b=II1vcKZXPG21vcvYFao9KENTsaACp52eZ2b3NV76CJV76/aUdFqQU/LDbHHiGLakHb fDABJk5n82b8Hu1CgA8rVAw6OpcYQqKzr3vXpLzMJ6NAKBxt1oySr7AdOHgEVUE+H/CN SU2znyrTaXu3UkP1IcN7Ke67lSkw8dSh2rjhB5CiRckdmyOYZ1VMHvltKQYzWYlR3SM7 kKS8nRGgk77R3hgVh9XwXvgcQWm/z31AJbmzaBB6R/nRSudXuLzJaSHey5ZNVypxm6fv DbGh1+5Nj3LaFmUlDBahOyW2yI/5w32rIItXwB8ilxeawqaztkb44reGSv6cJN2gOINr fU/g== 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=lrkZY0XDsPKEA4Vd4SIU4BTRrSN8Y6Tr/Ts6cuiqHMM=; b=Ns/zCj33sjf+uQq9wyLNpH5xBQiGEo9ABBYYfWYGeweyM67DUvBrbaQFMlZ2RJFnHN e8CaR8XCUPquwnlpiZULi9ZQIJ5mKDaIGvKGGAfARuE7PSfsQDpEXhJ5roefU2FB/8Kx dg864gJiXzyVM4rHMysFls/4gL8T7Ff4sFGvs8tSCmiIKCanzNanBZKJi0uTGfjH8c2/ tzyKjLs8m8gilvNPHysRLXAno05EVs2GZEks2vc4TkjQPLBYsUoxRoX4hjQZsH3aL2Tl oLQ1BFYNkBwH22j7lUYMWPRM3t1xfe1uQF78TxlDVSFNtuT8F1WI8qKcp5u+UBK80BvO jt4Q== X-Gm-Message-State: ALyK8tI3x8ywqYV88OGfzoZfK4bIjo1BgfWSO9TaKMjvdutqoZiq25Yls9RNbIIJpprCRA== X-Received: by 10.194.188.116 with SMTP id fz20mr3679510wjc.163.1465212264255; Mon, 06 Jun 2016 04:24:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 04:24:23 -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 1/5] Input: alps - move ALPS_PROTO_V6 out of alps_model_data table Date: Mon, 6 Jun 2016 13:23:57 +0200 Message-Id: <1465212241-14702-2-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_v6_protocol_data and use it in alps_identify() function. Signed-off-by: Pali Rohár --- drivers/input/mouse/alps.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 936f07a..eb0c57b 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -133,7 +133,6 @@ static const struct alps_model_info alps_model_data[] = { /* Dell Latitude E5500, E6400, E6500, Precision M4400 */ { { 0x62, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED } }, - { { 0x73, 0x00, 0x14 }, 0x00, { ALPS_PROTO_V6, 0xff, 0xff, ALPS_DUALPOINT } }, /* Dell XT2 */ { { 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 */ @@ -152,6 +151,10 @@ static const struct alps_protocol_info alps_v5_protocol_data = { ALPS_PROTO_V5, 0xc8, 0xd8, 0 }; +static const struct alps_protocol_info alps_v6_protocol_data = { + ALPS_PROTO_V6, 0xff, 0xff, ALPS_DUALPOINT +}; + static const struct alps_protocol_info alps_v7_protocol_data = { ALPS_PROTO_V7, 0x48, 0x48, ALPS_DUALPOINT }; @@ -2756,6 +2759,8 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) 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) { + protocol = &alps_v6_protocol_data; } else if (ec[0] == 0x88 && ((ec[1] & 0xf0) == 0xb0 || (ec[1] & 0xf0) == 0xc0)) { protocol = &alps_v7_protocol_data;