From patchwork Sat Oct 21 11:09:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 156437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp233063vqx; Sat, 21 Oct 2023 04:11:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaAM23MtvNkjxDUOA2DlHpBU3voLy5f+/ezXlDWHB6vMGx6wNPhzt/DoRpSm1/+MwbyQMs X-Received: by 2002:a05:6a21:6da8:b0:16b:f4ca:e3d9 with SMTP id wl40-20020a056a216da800b0016bf4cae3d9mr3953392pzb.27.1697886679747; Sat, 21 Oct 2023 04:11:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697886679; cv=none; d=google.com; s=arc-20160816; b=aHyoK8jtrNi0leQqFT12OHZYu8+/31SVRH8fVIXAjHlnQnuR5En6MUWYg0dNeEpAzV Vp1dhq/cnCSNw103juSphE470Gq3BH0x7OV9txpG70Kra/BvxnEVhoLhFgPAaYUvXDyd Pj9aUQI9qTSzMEwyyvIjAuJtsAl78gBYzPADAo0wMHJgtHLo/5wzdX0vkZ07iI7ENqkN 5uy7jNwOeyyXi8t71bYURgOe2Qus227utOkFUdyN7no9FyE6+N9lv0lYP8Vwgn6wQLt4 NFEb4WAL53ZLS1druTs1xbiQAkWLNcdVRIGY9b885Hm8nwkr3LkBJLzgPvZr5I8DgUnn fUeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=aB4JTBbloeJlOrROqSHyOpiwaZu7mID8DECUoJEbjX8=; fh=q4FJCsEhN5Gy3tvvDiDTMENUYU/ue0iHHb8V1mHEuq0=; b=A0bnJ0q6UkwiS+TcnyxLsuC9j3dx2qzd7zIgdam6XxPBPKsmlbVGFzJkF9Yn7KUs0c 73rmUkOLRbSP5FZ3OcKX04KrXJ5W8POfy2ZEldfUuPo2BIVziYYgrKH0h2MBurHk5w9a BytDxviDjTX2lBt3uaN7g73ZnpdCi2M0iEVoN6I/rQyGQKE0lpe1Rky+DxGtV+oyXbZh iHBSjckm1QoTHwlAA+TKmeNGt+/MOeDFbPXYI2cN0Ww+A3C0a52ZHDfz7iV/R20KjsZg QHV0s26b72tAXnb21mr0AB/8MCblL1FsfsbAaLslFCkak0qxqH6yLYjIqBbpN/xESksv O6rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p8EQ0XRs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id t23-20020a17090ad15700b00274cd892b39si3441569pjw.132.2023.10.21.04.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 04:11:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p8EQ0XRs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 4D11780BB1F7; Sat, 21 Oct 2023 04:10:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231253AbjJULJu (ORCPT + 26 others); Sat, 21 Oct 2023 07:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230309AbjJULJq (ORCPT ); Sat, 21 Oct 2023 07:09:46 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F3D7D7E for ; Sat, 21 Oct 2023 04:09:34 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3296b3f03e5so1190206f8f.2 for ; Sat, 21 Oct 2023 04:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697886572; x=1698491372; darn=vger.kernel.org; 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=aB4JTBbloeJlOrROqSHyOpiwaZu7mID8DECUoJEbjX8=; b=p8EQ0XRsItLN5gweHBq20mlgztkddoKtXMPbe+ZDVuO/dkg2Wkq0cHYe44Xk4287+6 2d2zn7TbBKc4NsiRVc1O3n/fEO98NG1o2EB9SzirGFGWHNV0vu/hpMtXNXG54OTiK+Gv DHdToP52Ml4Wl0e9yaQc2qNjngAq3YUUO+/3RKLcy0vTCca5XW5jiUJfuPHOrNUOyRQa EmvTZvO3xUarLt5L8AG7gqFrCS1BgAP9tCco5DAmf9t1cdhrR4Qo1lRsVWLzxN+4nOai iYAHJ6Rjcf0CcUjvXlcGKtddVdVnmmGN6bq8Fc0jl37J5+6nbcuJoqriAiSMmA1kXCgW v1zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697886572; x=1698491372; 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=aB4JTBbloeJlOrROqSHyOpiwaZu7mID8DECUoJEbjX8=; b=XdsMQbDq7hclhoi7NTWhBEPevdHcP4D8VYyCKLe5fWxgilUSW2ZtLTzYjvFbWBr1Y0 z1CXofpWhmX8VpnKxFubeaL7/AO7JECF2hhP5vBdyoNoKLrfe49rT4dx2/leYp46wDul +a+Jvkl0pXDJjAs0qQWNre9j++WnjN0HDPA91Lih8q4zNPVgXoVvS5ecOtG47P83m+0z 5EN4LqqbsrnjhYtqUXIyANurJy/bUEdakF90xUfF8H+9laa1JZsaXBDZ7vG5xjJ0LK0S 4xrLbY9lLzKE4SQfuuSCHx6xKt6PqPbV/BBzR2la5AXDYGA/eSLVe/EqgiBDWfPSaK22 1DmA== X-Gm-Message-State: AOJu0YwQLn62BM3igYAALUKSZGZj9tgb0NAb6yqz4NojOPMBDlEfEz25 gZnd8b/klJ5JrfXYuaGEavU7Xg== X-Received: by 2002:adf:eecc:0:b0:32d:a2d7:ae88 with SMTP id a12-20020adfeecc000000b0032da2d7ae88mr3508639wrp.43.1697886572444; Sat, 21 Oct 2023 04:09:32 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id o7-20020a056000010700b003232d122dbfsm3491096wrx.66.2023.10.21.04.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 04:09:32 -0700 (PDT) From: Neil Armstrong Date: Sat, 21 Oct 2023 13:09:26 +0200 Subject: [PATCH v9 4/4] Input: goodix-berlin - add SPI support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20231021-topic-goodix-berlin-upstream-initial-v9-4-13fb4e887156@linaro.org> References: <20231021-topic-goodix-berlin-upstream-initial-v9-0-13fb4e887156@linaro.org> In-Reply-To: <20231021-topic-goodix-berlin-upstream-initial-v9-0-13fb4e887156@linaro.org> To: Dmitry Torokhov , linux-input@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8018; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=Qt+npl8i2OE+s8j4Ze03++ftzJ+qPlUeps9Tw1QwAkg=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlM7FnrYS1E9+SBgVDdlT37AOWi1Y9DsgZKvl6r2ut rxH//XSJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZTOxZwAKCRB33NvayMhJ0RpxEA CrO12P596OWAKyIuD6Z8EpSlTKGOtFTMlBtdFG9LwhhlVYpNpSmCjVHhnpnCPWgQJBJ5i7c0onzGfS H8Swdij2CuVMRN/1rkyTxZ/wR48sxT0uJPcd4GtZCDovraGUrC0kN9s6+RvxO/pzU7TcK8zkjuCcY3 MS1X4M0Sz+j+BAlvWXxTaplNqoES5a3wlWkDiQbt0HqKMBRPSeWG+enbwaNlIviKdrToKebAytxMWQ K9VkGrbS/o9cM+PNNxZejuijYJxd8DKLz/aJgQ12RymjAXlsaakKpaUeZ0NYgp+ir7D7b5EElU4Zrn WxmrXR5lSzCaSvPhi/4HI0YheXrf/mUVpN0xRBJu8KZG17VvlQwcd1vA+Hi2yuIU34lq9LY2T0uwb0 SIiMZXBNPYZOrBuG6gQoVVY6tH9BzMXmUQ+Sa18bYEigBflM9+39gqnWRHoXP65zVVg2khjdl93CUG ghynQwd9h5AHZs4Os1IDAPOT/DlsD3z7KDjeqsexQ+paPoMKvydibjJkp5Sw1cbxDvI0T0JXbh9krB 3BkamdFZu9w4Y9Zyx1nJRFGsv5HB5VtPRmaFjsO3iajI0xzJVEKvyR4XFZUtLUh7z8lbtPkCGvuaRL WeK3btXw5ZisChihl4zeTjUQMQrpgtFGvvQVkBxYHW0R++yJfilLvVEJuEcQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sat, 21 Oct 2023 04:10:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780363222966945799 X-GMAIL-MSGID: 1780363222966945799 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-drivers Reviewed-by: Jeff LaBundy Signed-off-by: Neil Armstrong --- drivers/input/touchscreen/Kconfig | 14 +++ drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/goodix_berlin_spi.c | 173 ++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index cc7b88118158..c821fe3ee794 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -433,6 +433,20 @@ config TOUCHSCREEN_GOODIX_BERLIN_I2C To compile this driver as a module, choose M here: the module will be called goodix_berlin_i2c. +config TOUCHSCREEN_GOODIX_BERLIN_SPI + tristate "Goodix Berlin SPI touchscreen" + depends on SPI_MASTER + select REGMAP + select TOUCHSCREEN_GOODIX_BERLIN_CORE + help + Say Y here if you have a Goodix Berlin IC connected to + your system 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 7ef677cf7a10..a81cb5aa21a5 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_GOODIX) += goodix_ts.o obj-$(CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE) += goodix_berlin_core.o obj-$(CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C) += goodix_berlin_i2c.o +obj-$(CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI) += goodix_berlin_spi.o obj-$(CONFIG_TOUCHSCREEN_HIDEEP) += hideep.o obj-$(CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX) += hynitron_cstxxx.o obj-$(CONFIG_TOUCHSCREEN_ILI210X) += 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..1f57c3592918 --- /dev/null +++ b/drivers/input/touchscreen/goodix_berlin_spi.c @@ -0,0 +1,173 @@ +// 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 GOODIX_BERLIN_SPI_TRANS_PREFIX_LEN 1 +#define GOODIX_BERLIN_REGISTER_WIDTH 4 +#define GOODIX_BERLIN_SPI_READ_DUMMY_LEN 3 +#define GOODIX_BERLIN_SPI_READ_PREFIX_LEN (GOODIX_BERLIN_SPI_TRANS_PREFIX_LEN + \ + GOODIX_BERLIN_REGISTER_WIDTH + \ + GOODIX_BERLIN_SPI_READ_DUMMY_LEN) +#define GOODIX_BERLIN_SPI_WRITE_PREFIX_LEN (GOODIX_BERLIN_SPI_TRANS_PREFIX_LEN + \ + GOODIX_BERLIN_REGISTER_WIDTH) + +#define GOODIX_BERLIN_SPI_WRITE_FLAG 0xF0 +#define GOODIX_BERLIN_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 = context; + struct spi_transfer xfers; + struct spi_message spi_msg; + const u32 *reg = reg_buf; /* reg is stored as native u32 at start of buffer */ + u8 *buf; + int error; + + if (reg_size != GOODIX_BERLIN_REGISTER_WIDTH) + return -EINVAL; + + buf = kzalloc(GOODIX_BERLIN_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] = GOODIX_BERLIN_SPI_READ_FLAG; + put_unaligned_be32(*reg, buf + GOODIX_BERLIN_SPI_TRANS_PREFIX_LEN); + memset(buf + GOODIX_BERLIN_SPI_TRANS_PREFIX_LEN + GOODIX_BERLIN_REGISTER_WIDTH, + 0xff, GOODIX_BERLIN_SPI_READ_DUMMY_LEN); + + xfers.tx_buf = buf; + xfers.rx_buf = buf; + xfers.len = GOODIX_BERLIN_SPI_READ_PREFIX_LEN + val_size; + xfers.cs_change = 0; + spi_message_add_tail(&xfers, &spi_msg); + + error = spi_sync(spi, &spi_msg); + if (error < 0) + dev_err(&spi->dev, "spi transfer error, %d", error); + else + memcpy(val_buf, buf + GOODIX_BERLIN_SPI_READ_PREFIX_LEN, val_size); + + kfree(buf); + return error; +} + +static int goodix_berlin_spi_write(void *context, const void *data, + size_t count) +{ + unsigned int len = count - GOODIX_BERLIN_REGISTER_WIDTH; + struct spi_device *spi = context; + struct spi_transfer xfers; + struct spi_message spi_msg; + const u32 *reg = data; /* reg is stored as native u32 at start of buffer */ + u8 *buf; + int error; + + buf = kzalloc(GOODIX_BERLIN_SPI_WRITE_PREFIX_LEN + len, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + spi_message_init(&spi_msg); + memset(&xfers, 0, sizeof(xfers)); + + buf[0] = GOODIX_BERLIN_SPI_WRITE_FLAG; + put_unaligned_be32(*reg, buf + GOODIX_BERLIN_SPI_TRANS_PREFIX_LEN); + memcpy(buf + GOODIX_BERLIN_SPI_WRITE_PREFIX_LEN, + data + GOODIX_BERLIN_REGISTER_WIDTH, len); + + xfers.tx_buf = buf; + xfers.len = GOODIX_BERLIN_SPI_WRITE_PREFIX_LEN + len; + xfers.cs_change = 0; + spi_message_add_tail(&xfers, &spi_msg); + + error = spi_sync(spi, &spi_msg); + if (error < 0) + dev_err(&spi->dev, "spi transfer error, %d", error); + + kfree(buf); + return error; +} + +static const struct regmap_config goodix_berlin_spi_regmap_conf = { + .reg_bits = 32, + .val_bits = 8, + .read = goodix_berlin_spi_read, + .write = goodix_berlin_spi_write, +}; + +/* vendor & product left unassigned here, should probably be updated from fw info */ +static const struct input_id goodix_berlin_spi_input_id = { + .bustype = BUS_SPI, +}; + +static int goodix_berlin_spi_probe(struct spi_device *spi) +{ + struct regmap_config regmap_config; + struct regmap *regmap; + size_t max_size; + int error = 0; + + spi->mode = SPI_MODE_0; + spi->bits_per_word = 8; + error = spi_setup(spi); + if (error) + return error; + + max_size = spi_max_transfer_size(spi); + + regmap_config = goodix_berlin_spi_regmap_conf; + regmap_config.max_raw_read = max_size - GOODIX_BERLIN_SPI_READ_PREFIX_LEN; + regmap_config.max_raw_write = max_size - GOODIX_BERLIN_SPI_WRITE_PREFIX_LEN; + + regmap = devm_regmap_init(&spi->dev, NULL, spi, ®map_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + return goodix_berlin_probe(&spi->dev, spi->irq, + &goodix_berlin_spi_input_id, regmap); +} + +static const struct spi_device_id goodix_berlin_spi_ids[] = { + { "gt9916" }, + { }, +}; +MODULE_DEVICE_TABLE(spi, goodix_berlin_spi_ids); + +static const struct of_device_id goodix_berlin_spi_of_match[] = { + { .compatible = "goodix,gt9916", }, + { } +}; +MODULE_DEVICE_TABLE(of, goodix_berlin_spi_of_match); + +static struct spi_driver goodix_berlin_spi_driver = { + .driver = { + .name = "goodix-berlin-spi", + .of_match_table = goodix_berlin_spi_of_match, + .pm = pm_sleep_ptr(&goodix_berlin_pm_ops), + }, + .probe = goodix_berlin_spi_probe, + .id_table = goodix_berlin_spi_ids, +}; +module_spi_driver(goodix_berlin_spi_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Goodix Berlin SPI Touchscreen driver"); +MODULE_AUTHOR("Neil Armstrong ");