From patchwork Wed May 25 11:40:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Just X-Patchwork-Id: 9135935 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 E37BB607D9 for ; Wed, 25 May 2016 17:42:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D87E11FFC9 for ; Wed, 25 May 2016 17:42:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD1E02829C; Wed, 25 May 2016 17:42:04 +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 57546280BB for ; Wed, 25 May 2016 17:42:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932820AbcEYRl6 (ORCPT ); Wed, 25 May 2016 13:41:58 -0400 Received: from mail-ig0-f196.google.com ([209.85.213.196]:35326 "EHLO mail-ig0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932622AbcEYRl4 (ORCPT ); Wed, 25 May 2016 13:41:56 -0400 Received: by mail-ig0-f196.google.com with SMTP id i11so5898647igh.2 for ; Wed, 25 May 2016 10:41:55 -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=0NzWCRhJlb7AX0ePDeoJNQMz9i1vYzQbSAuS5aaxM/o=; b=yObCPEer/Y4gAyXMrwyzofmNeiChunKYAW9/OYczineVRhL3CDu9rraLVRPhAKwQNx DhbLUqrHBj+lkKTf5e1xlMHKjmCGMzHr8eztuQ+QTam0Iu0GsywS6qyMK+NZVbxry+t8 Qrk2msuxANB1w1jD3AxzpKs4ieLwQ31tORAjaHi8HPonLI/sP5+0og24HdheCIBe1eTK iEkLvtXX7oIhD9CPx0Sr4ZqBouaDY5KLvjfu24f0APW3jRc3pPxF0XUZHJnovQg8NpH7 BFw2sfMYI6Qng4qpKpUskss6hvKvzgns6SrdlfWK2W1uibLHSArNWur4oWubj6MKuCon YJQw== 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=0NzWCRhJlb7AX0ePDeoJNQMz9i1vYzQbSAuS5aaxM/o=; b=A2LvMsWqxY1wyIPNILgOowj0k6Axa5flks+e4I9zg3pWfu0dHdjzJudH+gE3z5YI4K tkDwegjsneMo4IC0ZI4epOF9Ggk0A418hyGm0rAjQ/n1uKQOfvRC8z96sH+q38esYOve WftaZgk4CmgcBfigUrit6ZZaGHBaYegS0BD8XXJu4h66xj+sGy4ytcsJQ4OBOpfCUJic p13VgNoot3LALysThRLrzKpjQCds7iJ0lHpbZZGXElNfMH3DWdZZqXq6EaUOE6wLX1OM 5vFPIlgy1igJK5TE9ux9IcWQIfrp1GwHIk3X1V6YyYViEur/p1FogwPVpsp6OHiwBX9a ObkQ== X-Gm-Message-State: ALyK8tJwW/nxYVnhpRPedqA2/bLfEaIzS2gUi0Hapl3a91063T8M5XnZyXL9m0OXGAxe6A== X-Received: by 10.50.111.15 with SMTP id ie15mr5141502igb.94.1464198115145; Wed, 25 May 2016 10:41:55 -0700 (PDT) Received: from arch_usb.localdomain (S0106c0c1c0256baf.ed.shawcable.net. [70.74.127.58]) by smtp.gmail.com with ESMTPSA id q15sm3140015iod.6.2016.05.25.10.41.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 May 2016 10:41:54 -0700 (PDT) From: Stephen Just To: linux-input@vger.kernel.org, Dmitry Torokhov , Benjamin Tissoires Cc: Stephen Just , Bastien Nocera , Peter Hutterer Subject: [PATCH v3 2/2] Input - surface3_spi: add surface pen support for Surface 3 Date: Wed, 25 May 2016 05:40:05 -0600 Message-Id: <1464176406-9917-3-git-send-email-stephenjust@gmail.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1464176406-9917-1-git-send-email-stephenjust@gmail.com> References: <1464176406-9917-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 This change creates a second input device which will handle input from a Surface Pen. The Surface Pen supplies a different packet header than touch events, so it is simple to handle one or the other. This patch handles both the newer Surface Pen with one button, and the older variant with a second button to switch to Eraser mode. Signed-off-by: Stephen Just --- v1 -> v2: Code cleanup w/ switch/case v2 -> v3: Send proximity-out event when switching tools drivers/input/touchscreen/surface3_spi.c | 114 ++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/surface3_spi.c b/drivers/input/touchscreen/surface3_spi.c index 204a162..63548743 100644 --- a/drivers/input/touchscreen/surface3_spi.c +++ b/drivers/input/touchscreen/surface3_spi.c @@ -28,11 +28,14 @@ #define SURFACE3_PACKET_SIZE 264 #define SURFACE3_REPORT_TOUCH 0xd2 +#define SURFACE3_REPORT_PEN 0x16 struct surface3_ts_data { struct spi_device *spi; struct gpio_desc *gpiod_rst[2]; struct input_dev *input_dev; + struct input_dev *pen_input_dev; + int pen_tool; u8 rd_buf[SURFACE3_PACKET_SIZE] ____cacheline_aligned; }; @@ -49,6 +52,14 @@ struct surface3_ts_data_finger { u32 padding; } __packed; +struct surface3_ts_data_pen { + u8 status; + __le16 x; + __le16 y; + __le16 pressure; + u8 padding; +} __packed; + static int surface3_spi_read(struct surface3_ts_data *ts_data) { struct spi_device *spi = ts_data->spi; @@ -114,6 +125,53 @@ static void surface3_spi_process_touch(struct surface3_ts_data *ts_data, u8 *dat input_sync(ts_data->input_dev); } +static void surface3_spi_report_pen(struct surface3_ts_data *ts_data, + struct surface3_ts_data_pen *pen) +{ + struct input_dev *dev = ts_data->pen_input_dev; + int st = pen->status; + int prox = st & 0x01; + int rubber = st & 0x18; + int tool = (prox && rubber) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN; + + /* fake proximity out to switch tools */ + if (ts_data->pen_tool != tool) { + input_report_key(dev, ts_data->pen_tool, 0); + input_sync(dev); + ts_data->pen_tool = tool; + } + + input_report_key(dev, BTN_TOUCH, st & 0x12); + + input_report_key(dev, ts_data->pen_tool, prox); + + if (st) { + input_report_key(dev, + BTN_STYLUS, + st & 0x04); + + input_report_abs(dev, + ABS_X, + get_unaligned_le16(&pen->x)); + input_report_abs(dev, + ABS_Y, + get_unaligned_le16(&pen->y)); + input_report_abs(dev, + ABS_PRESSURE, + get_unaligned_le16(&pen->pressure)); + } +} + +static void surface3_spi_process_pen(struct surface3_ts_data *ts_data, u8 *data) +{ + struct surface3_ts_data_pen *pen; + + pen = (struct surface3_ts_data_pen *)&data[15]; + + surface3_spi_report_pen(ts_data, pen); + input_sync(ts_data->pen_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}; @@ -125,12 +183,19 @@ static void surface3_spi_process(struct surface3_ts_data *ts_data) "%s header error: %*ph, ignoring...\n", __func__, (int)sizeof(header), data); - if (data[9] == SURFACE3_REPORT_TOUCH) + switch (data[9]) { + case SURFACE3_REPORT_TOUCH: surface3_spi_process_touch(ts_data, data); - else + break; + case SURFACE3_REPORT_PEN: + surface3_spi_process_pen(ts_data, data); + break; + default: dev_err(&ts_data->spi->dev, "%s unknown packet type: %x, ignoring...\n", __func__, data[9]); + break; + } } static irqreturn_t surface3_spi_irq_handler(int irq, void *dev_id) @@ -224,6 +289,47 @@ static int surface3_spi_create_touch_input(struct surface3_ts_data *data) return 0; } +static int surface3_spi_create_pen_input(struct surface3_ts_data *data) +{ + struct input_dev *input; + int error; + + input = devm_input_allocate_device(&data->spi->dev); + if (!input) + return -ENOMEM; + + data->pen_input_dev = input; + data->pen_tool = BTN_TOOL_PEN; + + __set_bit(INPUT_PROP_DIRECT, input->propbit); + __set_bit(INPUT_PROP_POINTER, input->propbit); + input_set_abs_params(input, ABS_X, 0, 9600, 0, 0); + input_abs_set_res(input, ABS_X, 40); + input_set_abs_params(input, ABS_Y, 0, 7200, 0, 0); + input_abs_set_res(input, ABS_Y, 48); + input_set_abs_params(input, ABS_PRESSURE, 0, 1024, 0, 0); + input_set_capability(input, EV_KEY, BTN_TOUCH); + input_set_capability(input, EV_KEY, BTN_STYLUS); + input_set_capability(input, EV_KEY, BTN_TOOL_PEN); + input_set_capability(input, EV_KEY, BTN_TOOL_RUBBER); + + input->name = "Surface3 SPI Pen Input"; + input->phys = "input/ts"; + input->id.bustype = BUS_SPI; + input->id.vendor = 0x045e; /* Microsoft */ + input->id.product = 0x0002; + input->id.version = 0x0000; + + error = input_register_device(input); + if (error) { + dev_err(&data->spi->dev, + "Failed to register input device: %d", error); + return error; + } + + return 0; +} + static int surface3_spi_probe(struct spi_device *spi) { struct surface3_ts_data *data; @@ -255,6 +361,10 @@ static int surface3_spi_probe(struct spi_device *spi) if (error) return error; + error = surface3_spi_create_pen_input(data); + if (error) + return error; + error = devm_request_threaded_irq(&spi->dev, spi->irq, NULL, surface3_spi_irq_handler, IRQF_ONESHOT,