From patchwork Mon Jun 6 11:24:00 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: 9157889 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 EDBEE60759 for ; Mon, 6 Jun 2016 11:25:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF8F1267EC for ; Mon, 6 Jun 2016 11:25:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D46D626E5D; Mon, 6 Jun 2016 11:25:07 +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 78464267EC for ; Mon, 6 Jun 2016 11:25:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751976AbcFFLYh (ORCPT ); Mon, 6 Jun 2016 07:24:37 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32823 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751808AbcFFLYe (ORCPT ); Mon, 6 Jun 2016 07:24:34 -0400 Received: by mail-wm0-f68.google.com with SMTP id c74so7445481wme.0; Mon, 06 Jun 2016 04:24:33 -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=6BPExpe1dw0WngyFaK/oAX0tU8LGfgJMwQbLEbO6reY=; b=SlNDvTPZa4EIlfaaX/+BJ0uc/clZoPsMn0pmDwvC/O/zTCvS9+JLYfvyQjl0LL41id ZDd8Ea4w7cPraIMrv1dNzVJYV1Dnq/9kN2cTbPuzLkbiG6of0SMTjTB6ZXMIGZeo0vx1 TzOUzrQhTmqW8CE2aaIkVh1hCSgd/oYJAuIlVOkadiJ+9TR8wNrJm+bpgLIHRERyeBEW Wg0Y4f0Nhb07pqDj/aPs7E+HrU7seYz/me9eXmJ8+Tfy5xoM8UsOnYowK8thI1riD/G4 MguPxvXgFti1w28pS8fQisDGZMRJAMYgtQk5dtGkDDXWu7NTI69dmadsuT8VHDq5fRbg dNAg== 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=6BPExpe1dw0WngyFaK/oAX0tU8LGfgJMwQbLEbO6reY=; b=GGpZGSzrqxJIC9PQbCz3L8oYBxBXDXuHCsGAIXP2B/ba1KPEm5PqMVnl5rZjJzBP5j MOxkQYoiXft5fdtWGkL45az3Z0eKlaYYCnkX4MhRaSJkjRG7lSoxST84dMTwgKwdZqyE L16cnslZx+jYg4seTSu4x5xbL99ZUHfxXq4EUdCbY6SJ1drhQFwmINupBE3vgJpAIDSP hTRmS7gBGK1bDrrDvXtybaYtgZ9HfUcgKpPtgBI7zlLG4+b5lSDEQidvjENQyTMWpLGf QeIUUptR8iGzjiWvm65vdO2NHrIlqpj8GS1xWD6SEVIauVTVtH9xTcsZsqoMJf4KRYx9 iCWw== X-Gm-Message-State: ALyK8tK4PMfcwLrc46FYkXnIaQ9bSMd7TRrtUTKoBK3jlrieToFPoD2qjaQgjXLLeiGqTQ== X-Received: by 10.195.18.102 with SMTP id gl6mr13685435wjd.54.1465212272415; Mon, 06 Jun 2016 04:24:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 04:24:31 -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 4/5] Input: alps - warn about unsupported ALPS V9 touchpad Date: Mon, 6 Jun 2016 13:24:00 +0200 Message-Id: <1465212241-14702-5-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 Support for devices with ALPS_PROTO_V9 is not implemented yet but we can detect these alps touchpads and warn users about it. Signed-off-by: Pali Rohár --- drivers/input/mouse/alps.c | 9 +++++++++ drivers/input/mouse/alps.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 4e6d76e..3618320 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -169,6 +169,10 @@ static const struct alps_protocol_info alps_v8_protocol_data = { ALPS_PROTO_V8, 0x18, 0x18, 0 }; +static const struct alps_protocol_info alps_v9_protocol_data = { + ALPS_PROTO_V9, 0xc8, 0xc8, 0 +}; + /* * Some v2 models report the stick buttons in separate bits */ @@ -2783,6 +2787,11 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) } else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x14 && ec[1] == 0x02) { protocol = &alps_v8_protocol_data; + } else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0xc8) { + protocol = &alps_v9_protocol_data; + psmouse_warn(psmouse, + "Unsupported ALPS V9 touchpad: E7=%3ph, EC=%3ph\n", e7, ec); + return -EINVAL; } else { psmouse_dbg(psmouse, "Likely not an ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec); diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index d37f814..fd0a359 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h @@ -23,6 +23,7 @@ #define ALPS_PROTO_V6 0x600 #define ALPS_PROTO_V7 0x700 /* t3btl t4s */ #define ALPS_PROTO_V8 0x800 /* SS4btl SS4s */ +#define ALPS_PROTO_V9 0x900 /* ss3btl */ #define MAX_TOUCHES 4