From nobody Mon Feb 9 09:32:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C86A8C77B73 for ; Tue, 6 Jun 2023 14:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237982AbjFFOc4 (ORCPT ); Tue, 6 Jun 2023 10:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237957AbjFFOcX (ORCPT ); Tue, 6 Jun 2023 10:32:23 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46934E47 for ; Tue, 6 Jun 2023 07:32:07 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f736e0c9b1so30995835e9.3 for ; Tue, 06 Jun 2023 07:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686061925; x=1688653925; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AAHo2Ft1e4SvLLm6iTKloBaUK4EchMGqUU8Wjhy/k70=; b=gxqEzE5DKF2zKRp7AXjoAqJXMSTZbGjQfyv3kzUQEuT0wOKja/9r8UGNgJugFcZfJJ /goIRBmzss9mEoDjf/dRaQ6y8PaTxMl0lkcY/vnJ/wQ7mQRb1B455WCRHSKQYnCFdX3q S44oxRx6PZN4Qe64p5hOHNUt3nfciohU7H1X7rE4RXhbgOxWMWaddoy+kPZwAgcYvghH wMl1n500nGhBjLrF3oBAl0r3/mCN1qpzwknf6ErFRE73tIgCEPMG3gFuiN9QIlkVs4us i1Y4/sicV6rYT9+Y/SQ33iLoXIuWvquuivQX4Xj1YBjCCF6JRb07m7dTJCsg2JlLBwcE JwCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686061925; x=1688653925; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AAHo2Ft1e4SvLLm6iTKloBaUK4EchMGqUU8Wjhy/k70=; b=L/hDG7UtA0NBBD80PVWd+QsMu6EA3IDYwZHEcHnMOY1xc+bky7Zaq0dK4EQjU3L/ZK k9/ghZP9d/N8u48QQouph2xgDABu2o56sgGwB8ikXGR/T0+Y9vCRnavuY+TDuSeQeMZu 5fSGQl6vx0jz14iiHtje57rfsfJErxubtZzlWFuR8KROZeCG6MoQNeU8NgreZugVKomC ZdPVZlf9ni/XFBwDQQATyr6cfzNEPwAe+mKJzjhQmSbDdJaRhoX5SCCgrEP54P5yKiOw NuEAehTT8pB6pQs0SOkmJzEP/pgFTHHqPdYCF+PY9a7NlQqHsD09J8BxcDX8GJ5y6Q1V I+IQ== X-Gm-Message-State: AC+VfDyGF4n933ElBcClyF8XUOLT7Vsw9tWOFy/yOrCJVad7OvGZVwCx TSZj+uTnB6VsouiWM19WXwLavw== X-Google-Smtp-Source: ACHHUZ65Rt0pJyezM2Tl8YuCIG2oNvDJONeF0pQC1k3stBKHW6YpNweuacyHAcVHvem4ha8kuDcTYA== X-Received: by 2002:a05:600c:b45:b0:3f4:d18f:b2fb with SMTP id k5-20020a05600c0b4500b003f4d18fb2fbmr2481431wmr.8.1686061925651; Tue, 06 Jun 2023 07:32:05 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id fc14-20020a05600c524e00b003f61177faffsm3883600wmb.0.2023.06.06.07.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 07:32:05 -0700 (PDT) From: Neil Armstrong Date: Tue, 06 Jun 2023 16:31:59 +0200 Subject: [PATCH RFC 4/4] input: touchscreen: add SPI support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230606-topic-goodix-berlin-upstream-initial-v1-4-4a0741b8aefd@linaro.org> References: <20230606-topic-goodix-berlin-upstream-initial-v1-0-4a0741b8aefd@linaro.org> In-Reply-To: <20230606-topic-goodix-berlin-upstream-initial-v1-0-4a0741b8aefd@linaro.org> To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg Cc: linux-input@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7697; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=vn7duBP7sfXMbumxh4swTtaBAVKnUxfLgRt1So/mze8=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkf0Ng06P6FQgdVTW3g+9T+7UF1C2g0KM+3+N0Zltm QPbDh/2JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZH9DYAAKCRB33NvayMhJ0YjhEA C6nwIRpZK0MNlYr4k7ypGtVDu4d1S4ESVBQ4+4z9/GVYV/XfGPn1uE1gSG7XWYrdoK4xzoC34dxDAz crMw8S83+OLAF2lGMpBqWX4tZMpyE/2NuZR2hLlV8PpqUYK5YohbCAoHOOVhh4aaic9h3HYhvciqGK JPd27nq2mvNEME76uId3mvcZCTkOBcr7Tk3LQXBQXOQoML/79xIZWWC4MLld9pHLJ5NAfZgdUSym/A zAOH795HyLMK6ShMPcclujqrIW8LjScuEXhgGyXLP+Tp3xP47XO5gv5NmXW7uZh8Z7LcbwDJWE7LrT LMajy8rMmsQGbnx1EIl3x8Ls3EAXD5FxCFm0alAMduMWaPRE5xG5sbCNiJkt44H2K7OCJhb2ji2dRA idjd0gXbOKyAqT03/uKlUV2Y6vcf8nVPJ/nvXgum8oMNFQHtzQ9//74J9oe6raK5UM/Pwa9v36mE74 QAMejwwVgUjXgAP0zGGaTdDcH1hWbltQrVeUrnLF37is7tX5EgTWN/qtlxwY1V987aHnUVaEJycxql cG+pxpgUEb3Vhoxo6Op5l0ZkijGZbqvxAen/kCAcsdh7fgXtQ28rVm/OpdbwmZQm3RtETgMn8i1e+N aEjp7f3uqw00eklQdojjwBN1BwnHh7rSN74Bei9EayVj52XQnL7/9JOM4XSg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add initial support for the new Goodix "Berlin" touchscreen ICs over the SPI interface. The driver doesn't use the regmap_spi code since the SPI messages needs to be prefixed, thus this custom regmap code. This initial driver is derived from the Goodix goodix_ts_berlin available at [1] and [2] and only supports the GT9916 IC present on the Qualcomm SM8550 MTP & QRD touch panel. The current implementation only supports BerlinD, aka GT9916. [1] https://github.com/goodix/goodix_ts_berlin [2] https://git.codelinaro.org/clo/la/platform/vendor/opensource/touch-driv= ers Signed-off-by: Neil Armstrong --- drivers/input/touchscreen/Kconfig | 14 ++ drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/goodix_berlin_spi.c | 183 ++++++++++++++++++++++= ++++ 3 files changed, 198 insertions(+) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/= Kconfig index da6d5d75c42d..ffe0c0a4cd15 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -435,6 +435,20 @@ config TOUCHSCREEN_GOODIX_BERLIN_I2C To compile this driver as a module, choose M here: the module will be called goodix_berlin_i2c. =20 +config TOUCHSCREEN_GOODIX_BERLIN_SPI + tristate "Goodix Berlin SPI touchscreen" + depends on SPI_MASTER + depends on REGMAP + select TOUCHSCREEN_GOODIX_BERLIN_CORE + help + Say Y here if you have the a touchscreen connected to your + system using the Goodix Berlin IC connection via SPI. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called goodix_berlin_spi. + config TOUCHSCREEN_HIDEEP tristate "HiDeep Touch IC" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen= /Makefile index 921a2da0c2be..29524e8a83db 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_TOUCHSCREEN_FUJITSU) +=3D fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_GOODIX) +=3D goodix_ts.o obj-$(CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE) +=3D goodix_berlin_core.o obj-$(CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C) +=3D goodix_berlin_i2c.o +obj-$(CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI) +=3D goodix_berlin_spi.o obj-$(CONFIG_TOUCHSCREEN_HIDEEP) +=3D hideep.o obj-$(CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX) +=3D hynitron_cstxxx.o obj-$(CONFIG_TOUCHSCREEN_ILI210X) +=3D ili210x.o diff --git a/drivers/input/touchscreen/goodix_berlin_spi.c b/drivers/input/= touchscreen/goodix_berlin_spi.c new file mode 100644 index 000000000000..0f4f650fdf3f --- /dev/null +++ b/drivers/input/touchscreen/goodix_berlin_spi.c @@ -0,0 +1,183 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Goodix Berlin Touchscreen Driver + * + * Copyright (C) 2020 - 2021 Goodix, Inc. + * Copyright (C) 2023 Linaro Ltd. + * + * Based on goodix_ts_berlin driver. + */ +#include +#include +#include +#include +#include + +#include "goodix_berlin.h" + +#define SPI_TRANS_PREFIX_LEN 1 +#define REGISTER_WIDTH 4 +#define SPI_READ_DUMMY_LEN 3 +#define SPI_READ_PREFIX_LEN (SPI_TRANS_PREFIX_LEN + REGISTER_WIDTH + SPI_R= EAD_DUMMY_LEN) +#define SPI_WRITE_PREFIX_LEN (SPI_TRANS_PREFIX_LEN + REGISTER_WIDTH) + +#define SPI_WRITE_FLAG 0xF0 +#define SPI_READ_FLAG 0xF1 + +static int goodix_berlin_spi_read(void *context, const void *reg_buf, + size_t reg_size, void *val_buf, + size_t val_size) +{ + struct spi_device *spi =3D context; + struct spi_transfer xfers; + struct spi_message spi_msg; + const u32 *reg =3D reg_buf; /* reg is stored as native u32 at start of bu= ffer */ + u8 *buf =3D NULL; + int ret =3D 0; + + if (reg_size !=3D REGISTER_WIDTH) + return -EINVAL; + + buf =3D kzalloc(SPI_READ_PREFIX_LEN + val_size, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + spi_message_init(&spi_msg); + memset(&xfers, 0, sizeof(xfers)); + + /* buffer format: 0xF1 + addr(4bytes) + dummy(3bytes) + data */ + buf[0] =3D SPI_READ_FLAG; + put_unaligned_be32(*reg, buf + SPI_TRANS_PREFIX_LEN); + memset(buf + SPI_TRANS_PREFIX_LEN + REGISTER_WIDTH, 0xff, + SPI_READ_DUMMY_LEN); + + xfers.tx_buf =3D buf; + xfers.rx_buf =3D buf; + xfers.len =3D SPI_READ_PREFIX_LEN + val_size; + xfers.cs_change =3D 0; + spi_message_add_tail(&xfers, &spi_msg); + + ret =3D spi_sync(spi, &spi_msg); + if (ret < 0) { + dev_err(&spi->dev, "transfer error:%d", ret); + goto exit; + } + + memcpy(val_buf, buf + SPI_READ_PREFIX_LEN, val_size); +exit: + kfree(buf); + return ret; +} + +static int goodix_berlin_spi_write(void *context, const void *data, + size_t count) +{ + unsigned int len =3D count - REGISTER_WIDTH; + struct spi_device *spi =3D context; + struct spi_transfer xfers; + struct spi_message spi_msg; + const u32 *reg =3D data; /* reg is stored as native u32 at start of buffe= r */ + u8 *buf =3D NULL; + int ret =3D 0; + + buf =3D kzalloc(SPI_WRITE_PREFIX_LEN + len, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + spi_message_init(&spi_msg); + memset(&xfers, 0, sizeof(xfers)); + + buf[0] =3D SPI_WRITE_FLAG; + put_unaligned_be32(*reg, buf + SPI_TRANS_PREFIX_LEN); + memcpy(buf + SPI_WRITE_PREFIX_LEN, data + REGISTER_WIDTH, len); + + xfers.tx_buf =3D buf; + xfers.len =3D SPI_WRITE_PREFIX_LEN + len; + xfers.cs_change =3D 0; + spi_message_add_tail(&xfers, &spi_msg); + + ret =3D spi_sync(spi, &spi_msg); + if (ret < 0) + dev_err(&spi->dev, "transfer error:%d", ret); + + kfree(buf); + return ret; +} + +static const struct regmap_config goodix_berlin_spi_regmap_conf =3D { + .reg_bits =3D 32, + .val_bits =3D 8, + .read =3D goodix_berlin_spi_read, + .write =3D goodix_berlin_spi_write, +}; + +static const struct input_id goodix_berlin_spi_input_id =3D { + .bustype =3D BUS_SPI, + .vendor =3D 0x0416, + .product =3D 0x1001, +}; + +static int goodix_berlin_spi_probe(struct spi_device *spi) +{ + struct regmap_config *cfg; + struct regmap *map; + size_t max_size; + int ret =3D 0; + + cfg =3D devm_kmemdup(&spi->dev, &goodix_berlin_spi_regmap_conf, + sizeof(*cfg), GFP_KERNEL); + if (!cfg) + return -ENOMEM; + + spi->mode =3D SPI_MODE_0; + spi->bits_per_word =3D 8; + ret =3D spi_setup(spi); + if (ret) + return ret; + + max_size =3D spi_max_transfer_size(spi); + cfg->max_raw_read =3D max_size - SPI_READ_PREFIX_LEN; + cfg->max_raw_write =3D max_size - SPI_WRITE_PREFIX_LEN; + + map =3D devm_regmap_init(&spi->dev, NULL, spi, cfg); + if (IS_ERR(map)) + return PTR_ERR(map); + + return goodix_berlin_probe(&spi->dev, spi->irq, + &goodix_berlin_spi_input_id, map); +} + +static void goodix_berlin_spi_remove(struct spi_device *spi) +{ + goodix_berlin_remove(&spi->dev); +} + +static const struct of_device_id goodix_berlin_spi_of_match[] =3D { + { + .compatible =3D "goodix,gt9916", + }, + { }, +}; +MODULE_DEVICE_TABLE(of, goodix_berlin_spi_of_match); + +static const struct spi_device_id goodix_berlin_spi_ids[] =3D { + { "gt9916" }, + { }, +}; +MODULE_DEVICE_TABLE(spi, goodix_berlin_spi_ids); + +static struct spi_driver goodix_berlin_spi_driver =3D { + .driver =3D { + .name =3D "goodix-berlin-spi", + .of_match_table =3D goodix_berlin_spi_of_match, + .pm =3D pm_sleep_ptr(&goodix_berlin_pm_ops), + }, + .id_table =3D goodix_berlin_spi_ids, + .probe =3D goodix_berlin_spi_probe, + .remove =3D goodix_berlin_spi_remove, +}; +module_spi_driver(goodix_berlin_spi_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Goodix Berlin SPI Touchscreen driver"); +MODULE_AUTHOR("Neil Armstrong "); --=20 2.34.1