From patchwork Tue May 24 13:43:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Just X-Patchwork-Id: 9134185 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 180C960221 for ; Tue, 24 May 2016 19:48:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0914A2829D for ; Tue, 24 May 2016 19:48:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDC582829F; Tue, 24 May 2016 19:48:13 +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=-5.2 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 8EF892829D for ; Tue, 24 May 2016 19:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754597AbcEXTsN (ORCPT ); Tue, 24 May 2016 15:48:13 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:35087 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754389AbcEXTsM (ORCPT ); Tue, 24 May 2016 15:48:12 -0400 Received: by mail-io0-f194.google.com with SMTP id 190so3063069iow.2 for ; Tue, 24 May 2016 12:48:11 -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; bh=8PWlgr4532ZwgJM8vlgzaAQ16zfrmdgRPy+NN4rXGnA=; b=kB23+FIfD/CClgVhEuqF9ENQDut4VZIj+lw8Jt/WedX3OSpILVUKr+0geBxMQNqGlb OTesAzHLOrGhtyCaXhy2ftIVQbzz/Uc9jc3VsAMBY6t7Y5eX72McL/3LG3uhUCnBv+a8 FFvLjiTqRT0eKbkkLWRr7KTUrKmABTpm+YiKKCQb4Cn14TYvV5NbBgaicZedWvZxivc+ ReXoWsYOXu4p+AP3EBMezGTizVWejzx/X92tVGrcufwQNXO3BXImDF5WC8Qj+QO6khnK T1tNL6TS5S0lKS9YVQVM/bdeYiQ1lMgpiNMGsizCLO0ryRvvQA0OC+xmsKefN3HkxOgi mpYg== 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; bh=8PWlgr4532ZwgJM8vlgzaAQ16zfrmdgRPy+NN4rXGnA=; b=KdI593gFsvR8Ckvx9xYMVPr8BZ8yu8NJgnppd9lFb/zfH+jNW0SJtsWsY7oNxVrI6Q HpQpsRaky+iaEbfvTveRbmW7l548/35qi+hB4VYnZ3gXqnj7pBaspz+Mfm0rfp+7dxGR PE2Shx3CBIDq92LLtX6SLrbg4L7yqjddxFL5nld32jWlcYS+Lja+jgPVq//WiaRk2t6j JkiM2FaIAUCGfGfkqEGn3/V9ew9f4GtocV2L30RZeRADgnKDgGppmW6oA/PUghA6bfI8 8nS0HFonESoTBGqMgKx7N81tuZZ3SaXvZ9ZLbKr+t5kWJ7gGHL6hJQWFTiRSiZk5cqEG C7AA== X-Gm-Message-State: ALyK8tJPjYZbfaroTGUByI4Ep8V4we1Zn+hh1QvFmF++lErG3WGMjz5zl93F/ddQegj+6Q== X-Received: by 10.107.2.70 with SMTP id 67mr510172ioc.70.1464119290986; Tue, 24 May 2016 12:48:10 -0700 (PDT) Received: from arch_usb.localdomain (S0106c0c1c0256baf.ed.shawcable.net. [70.74.127.58]) by smtp.gmail.com with ESMTPSA id a10sm5924866ign.20.2016.05.24.12.48.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 May 2016 12:48:10 -0700 (PDT) From: Stephen Just To: linux-input@vger.kernel.org, Dmitry Torokhov , Benjamin Tissoires Cc: Stephen Just , Bastien Nocera Subject: [PATCH v2 1/2] Input - surface3_spi: Prepare to add support for Surface Pen Date: Tue, 24 May 2016 07:43:52 -0600 Message-Id: <1464097434-10063-2-git-send-email-stephenjust@gmail.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1464097434-10063-1-git-send-email-stephenjust@gmail.com> References: <1464011734-18657-1-git-send-email-stephenjust@gmail.com> <1464097434-10063-1-git-send-email-stephenjust@gmail.com> 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 Surface Pens can be supported by handling a second report type. Prepare for this change. Signed-off-by: Stephen Just --- drivers/input/touchscreen/surface3_spi.c | 38 +++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/input/touchscreen/surface3_spi.c b/drivers/input/touchscreen/surface3_spi.c index 58631d1..204a162 100644 --- a/drivers/input/touchscreen/surface3_spi.c +++ b/drivers/input/touchscreen/surface3_spi.c @@ -27,6 +27,8 @@ #define SURFACE3_PACKET_SIZE 264 +#define SURFACE3_REPORT_TOUCH 0xd2 + struct surface3_ts_data { struct spi_device *spi; struct gpio_desc *gpiod_rst[2]; @@ -84,19 +86,10 @@ static void surface3_spi_report_touch(struct surface3_ts_data *ts_data, } } -static void surface3_spi_process(struct surface3_ts_data *ts_data) +static void surface3_spi_process_touch(struct surface3_ts_data *ts_data, u8 *data) { - const char header[] = {0xff, 0xff, 0xff, 0xff, 0xa5, 0x5a, 0xe7, 0x7e, - 0x01, 0xd2, 0x00, 0x80, 0x01, 0x03, 0x03}; - u8 *data = ts_data->rd_buf; u16 timestamp; unsigned int i; - - if (memcmp(header, data, sizeof(header))) - dev_err(&ts_data->spi->dev, - "%s header error: %*ph, ignoring...\n", - __func__, (int)sizeof(header), data); - timestamp = get_unaligned_le16(&data[15]); for (i = 0; i < 13; i++) { @@ -121,6 +114,25 @@ static void surface3_spi_process(struct surface3_ts_data *ts_data) input_sync(ts_data->input_dev); } +static void surface3_spi_process(struct surface3_ts_data *ts_data) +{ + const char header[] = {0xff, 0xff, 0xff, 0xff, 0xa5, 0x5a, 0xe7, 0x7e, 0x01}; + + u8 *data = ts_data->rd_buf; + + if (memcmp(header, data, sizeof(header))) + dev_err(&ts_data->spi->dev, + "%s header error: %*ph, ignoring...\n", + __func__, (int)sizeof(header), data); + + if (data[9] == SURFACE3_REPORT_TOUCH) + surface3_spi_process_touch(ts_data, data); + else + dev_err(&ts_data->spi->dev, + "%s unknown packet type: %x, ignoring...\n", + __func__, data[9]); +} + static irqreturn_t surface3_spi_irq_handler(int irq, void *dev_id) { struct surface3_ts_data *data = dev_id; @@ -176,7 +188,7 @@ static int surface3_spi_get_gpio_config(struct surface3_ts_data *data) return 0; } -static int surface3_spi_create_input(struct surface3_ts_data *data) +static int surface3_spi_create_touch_input(struct surface3_ts_data *data) { struct input_dev *input; int error; @@ -199,7 +211,7 @@ static int surface3_spi_create_input(struct surface3_ts_data *data) input->phys = "input/ts"; input->id.bustype = BUS_SPI; input->id.vendor = 0x045e; /* Microsoft */ - input->id.product = 0x0000; + input->id.product = 0x0001; input->id.version = 0x0000; error = input_register_device(input); @@ -239,7 +251,7 @@ static int surface3_spi_probe(struct spi_device *spi) surface3_spi_power(data, false); surface3_spi_power(data, true); - error = surface3_spi_create_input(data); + error = surface3_spi_create_touch_input(data); if (error) return error;