From patchwork Mon Oct 2 06:54:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 728617 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 31682E784A4 for ; Mon, 2 Oct 2023 06:54:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235601AbjJBGy7 (ORCPT ); Mon, 2 Oct 2023 02:54:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235570AbjJBGy5 (ORCPT ); Mon, 2 Oct 2023 02:54:57 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF7E7A6 for ; Sun, 1 Oct 2023 23:54:54 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4060b623e64so16011625e9.0 for ; Sun, 01 Oct 2023 23:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696229693; x=1696834493; 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=Z5GSTRd7yWsW/2h2X+KrYHhvI8Ce18nIFifnprRO8h4=; b=Tlrn/vYwuXInBZVAoirYIDlHxS5qQvGlzrblrEPbG+wxNX9m32ZzQTAwpjqOqze+Eo 0S/oYSS1a8ItskZ8HkZdO/PZZbTRPAKh+onDCv6k0d4RU1MK2zmlEL8A0cyxCHZ3tqk3 jJgUAPDHryL8UfgVeLq2xv/GER4kM6h/Zt6yX1OlvtPmDkYB9j2eZcePCULWMSduXcOM 5f26Is1pSy2hhfeEI8cdov9YhZgfxIM//6BG/bewFrhLMMKzKQ+43toFVVvfNqfW6iGU j18Thk2e4/cDjV+YfuRs4AalVcqDozyvp6aASBWv7fnnuKtwnKqVg89FLb43JTZYgPVB MMhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696229693; x=1696834493; 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=Z5GSTRd7yWsW/2h2X+KrYHhvI8Ce18nIFifnprRO8h4=; b=WJFmgzAXzUnF2WKWWZ9Cxhv+cYymYMG1iX2qwDEe3GxqAXtuCb/HtN0kKWtciw3HgP wkjK64SHpw0rEV4/KtTtNv3CDnNHfNvYzL8eX78Mp+5GmTMOzt3i282N+Y78dxFV1fp6 gbi0wHlZXPinhmZHedEDLyEO5JrBuLyfONH8AgmAshresj9uxUM3j68oQS090xeZEWuf FZLmfiggtn1lN42fPL0S3yKlrki+y2YYZxTPNe5HjQ95h93LoXzmSSjjy9aCBxcir8bT G5q8UfoLiukoPMUIzejb+atlu/97YT2YWO7owfK1HuUf8d+loGSZsihzgE4IZZPK/QVF LJ5w== X-Gm-Message-State: AOJu0YwHCDoU5PUTl3OrvdzbnWySOX97xCBd1qJwAkwnvqI2rJ2cFqj4 d7FF1leqEWHmpTkBYOL6xIAUIg== X-Google-Smtp-Source: AGHT+IHSFkYGe9ywnhVbfekeSOhRWU4gUzXtkUlO9vJNOEJdq5RthX09m2NrUsBGR4e1vxQxuHEOKQ== X-Received: by 2002:a05:600c:1614:b0:401:c7ec:b930 with SMTP id m20-20020a05600c161400b00401c7ecb930mr9033273wmn.10.1696229693038; Sun, 01 Oct 2023 23:54:53 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id 3-20020a05600c020300b004063cced50bsm6601815wmi.23.2023.10.01.23.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 23:54:52 -0700 (PDT) From: Neil Armstrong Date: Mon, 02 Oct 2023 08:54:46 +0200 Subject: [PATCH v7 3/4] Input: goodix-berlin - add I2C support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20231002-topic-goodix-berlin-upstream-initial-v7-3-792fb91f5e88@linaro.org> References: <20231002-topic-goodix-berlin-upstream-initial-v7-0-792fb91f5e88@linaro.org> In-Reply-To: <20231002-topic-goodix-berlin-upstream-initial-v7-0-792fb91f5e88@linaro.org> To: Dmitry Torokhov Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy , 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.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4476; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=fvuZaiaDmAw7atVHwbHQLhUjO6UmtXJUopSvbqmyj84=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlGmk4tCyb25I35FtjvUenlxHQ8UL7bQWz4AcVVWsU vGcBx7uJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZRppOAAKCRB33NvayMhJ0XQxEA Chl5zW0Hi8HXH8SwInfIPW+Vi6Bib44xGgRAQAoj3+vQ059D/qHy4smy1OefWyNNwIoe6u2hOw0Dt6 /he9t69hKb5BbWTFxHUnRX71x26/aVA9FTFl7YTJfZqLBWgC1J7P4QyIm+jloGtehnfIdQ7p8titKd WuFNz/BBySZ1WBJu64YueATtcdLbl5sniJX0Q+vs4FYuciei1lPgWHPx397oK8wOfWb0z9m6/zCByY 3KabTvGXon0k0UBS3KHMdm8M8H8TbryLyBZQAFKq8nYQC4nZi139OH92b4RgYaYvM3n0G/1cXXKmGF 5cNKqvNoX8WqpLHuBNOt6Sbg4AtBSiTjqZcLIGNhG8EGKvQpqkWDThcgo5dlyTLBZzwm05csQ42Sdl 2mUJLHESSkvI7SgSQY8YT10feeiJJGWjJalzqi/MpLL7flnvuq7OiUgSO9cOovSX8gGCeyT4GCjHRs +DkfuxvallwDAPsS9xh9z/AE78RKSM7FjY/gd92FOzdKqi4AiJcQf+r9xtEmSQLEiSZ9QR5WXlOZJI /raYBWaQpyMVNpKq8q5AYaGmsbPjmjbESdiYnME3pmdux4m/yMlucltOqhvivK2aAwjzM0qlVsXAqs 4Toq+I4GoCpMg14qEz9WuOW4COcQtQL1ySBtS3eeEgyGyvnoLdoQyQ3Kb18w== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Add initial support for the new Goodix "Berlin" touchscreen ICs over the I2C interface. 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_i2c.c | 69 +++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 950da599ae1a..cc7b88118158 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -419,6 +419,20 @@ config TOUCHSCREEN_GOODIX config TOUCHSCREEN_GOODIX_BERLIN_CORE tristate +config TOUCHSCREEN_GOODIX_BERLIN_I2C + tristate "Goodix Berlin I2C touchscreen" + depends on I2C + select REGMAP_I2C + select TOUCHSCREEN_GOODIX_BERLIN_CORE + help + Say Y here if you have a Goodix Berlin IC connected to + your system via I2C. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called goodix_berlin_i2c. + config TOUCHSCREEN_HIDEEP tristate "HiDeep Touch IC" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 2e2f3e70cd2c..7ef677cf7a10 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -48,6 +48,7 @@ obj-$(CONFIG_TOUCHSCREEN_EXC3000) += exc3000.o 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_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_i2c.c b/drivers/input/touchscreen/goodix_berlin_i2c.c new file mode 100644 index 000000000000..6407b2258eb1 --- /dev/null +++ b/drivers/input/touchscreen/goodix_berlin_i2c.c @@ -0,0 +1,69 @@ +// 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 "goodix_berlin.h" + +#define I2C_MAX_TRANSFER_SIZE 256 + +static const struct regmap_config goodix_berlin_i2c_regmap_conf = { + .reg_bits = 32, + .val_bits = 8, + .max_raw_read = I2C_MAX_TRANSFER_SIZE, + .max_raw_write = I2C_MAX_TRANSFER_SIZE, +}; + +/* vendor & product left unassigned here, should probably be updated from fw info */ +static const struct input_id goodix_berlin_i2c_input_id = { + .bustype = BUS_I2C, +}; + +static int goodix_berlin_i2c_probe(struct i2c_client *client) +{ + struct regmap *regmap; + + regmap = devm_regmap_init_i2c(client, &goodix_berlin_i2c_regmap_conf); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + return goodix_berlin_probe(&client->dev, client->irq, + &goodix_berlin_i2c_input_id, regmap); +} + +static const struct i2c_device_id goodix_berlin_i2c_id[] = { + { "gt9916", 0 }, + { } +}; + +MODULE_DEVICE_TABLE(i2c, goodix_berlin_i2c_id); + +static const struct of_device_id goodix_berlin_i2c_of_match[] = { + { .compatible = "goodix,gt9916", }, + { } +}; +MODULE_DEVICE_TABLE(of, goodix_berlin_i2c_of_match); + +static struct i2c_driver goodix_berlin_i2c_driver = { + .driver = { + .name = "goodix-berlin-i2c", + .of_match_table = goodix_berlin_i2c_of_match, + .pm = pm_sleep_ptr(&goodix_berlin_pm_ops), + }, + .probe = goodix_berlin_i2c_probe, + .id_table = goodix_berlin_i2c_id, +}; +module_i2c_driver(goodix_berlin_i2c_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Goodix Berlin I2C Touchscreen driver"); +MODULE_AUTHOR("Neil Armstrong "); From patchwork Mon Oct 2 06:54:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 728616 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 B0E6AE784AF for ; Mon, 2 Oct 2023 06:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235625AbjJBGzD (ORCPT ); Mon, 2 Oct 2023 02:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235610AbjJBGzA (ORCPT ); Mon, 2 Oct 2023 02:55:00 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EE56E5 for ; Sun, 1 Oct 2023 23:54:55 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40537481094so165119055e9.0 for ; Sun, 01 Oct 2023 23:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696229694; x=1696834494; 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=wBWMIwJ1VFgZRThuGT9U3A2QXJqZ4Mb3tjQVPqPez9sRl/xAWsS77UtozHiPmEMWUI tloLl3Kaxb9M6seLS8JIf7Zp+e5yTV9643EVbsqvsiR2MS2Q2Wj1rYKVAXxrjs97LgzR jTlo1d4uqDWwPHsDcYeSI6J359zSadKNOLbevVOaFtTvCay0nwuyJ9JGACYIA50GpaQm odQdw/l9ppUTNFbtNbudEVtJ2zSdGTFToGOcNOAoU97ZFnP1saN+gPB67jxil2lkHP8L XUSRUWAYMRdn2jelHNEMGAUx+DSTltmkrPtIDc7qblPnCsuz9pMi/GeaeBf+Ikm6CSA2 weWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696229694; x=1696834494; 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=Eav5H6npGNXH7gc1aZniQLiEuCBl5a/JhYQK2rQm+0Q82L6AFa46+1HKrIkAZ1sVB8 bMwFTDUl9nXrZyAFi+H75wbCdMaJGiEDhcMg1Z2gO7DXNaMtBNx3kVzfZRRe8oiYyyc2 9n4bkRndZu6FR1OTlKUdre8LSqQBnDlyP0TiVldHtAHXi7PNRNaAXq1KfoHm3mbw+qtI mjwQxpkDOMBrBMdl+CySpd17XXQEiJ6xAr+5pUpcVX90NfepM6zwDYzMffuHeGNN/Nx+ MXjS2lkGR6b68p+j98zcOl+1jZwz1hJ+j9ml/ivW9nbtFUyWnLsetF+wYluVMHuEpoA6 h/lg== X-Gm-Message-State: AOJu0YwBMQNcEbnuqGxern7ozsj7rBAC3cjTDVfySwN8oQrcQm3ezivh 1FjhuZf2Sbc84a7bt1M7zem+zQ== X-Google-Smtp-Source: AGHT+IGcpZaeQwcU1b8+DWP6oSJv0lwehwZxmSJmg+oCVfoU1c05dJSQsuNq0Hot7ibfUGdSCR6icA== X-Received: by 2002:a7b:cd85:0:b0:401:d803:624f with SMTP id y5-20020a7bcd85000000b00401d803624fmr9311059wmj.4.1696229694032; Sun, 01 Oct 2023 23:54:54 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id 3-20020a05600c020300b004063cced50bsm6601815wmi.23.2023.10.01.23.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 23:54:53 -0700 (PDT) From: Neil Armstrong Date: Mon, 02 Oct 2023 08:54:47 +0200 Subject: [PATCH v7 4/4] Input: goodix-berlin - add SPI support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20231002-topic-goodix-berlin-upstream-initial-v7-4-792fb91f5e88@linaro.org> References: <20231002-topic-goodix-berlin-upstream-initial-v7-0-792fb91f5e88@linaro.org> In-Reply-To: <20231002-topic-goodix-berlin-upstream-initial-v7-0-792fb91f5e88@linaro.org> To: Dmitry Torokhov Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy , 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.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/ZANAwAKAXfc29rIyEnRAcsmYgBlGmk4wMV4BqHlgQSXmgf1Ii0uww1d2PtfuIdwfSSw kU1HKhaJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZRppOAAKCRB33NvayMhJ0ay+D/ 9bQZ6yeCbdJpHnWEYBeGL2jrUre3L4qV+ItLBHK3Ldxb9hNDXYhUb9fmz0GlMU87GSDntBiQ8225dh 8Ss0Ug7tlSz7f0TvBA7C6pqQ4c+JP8x2nchD6a3ASS7MWqyphQGMsksNdqFzO+9ZfhsVLtK93cKbHG 5aFvOcR7ZOOGPdhYF/tqrKSkPOgSqmQjq4izNvG0/lCLvqHZ2cBHpOBKzGK6+iCTA6l6sLlDsDsLn3 YiWc5UX6Koyfo0Mkzldr3QEY9/n3lrKCsIdzslmJFXqzJBiizDRjpE5SKgrwND1WUOSA/aWdLkviwO JTGSE7Z0cJ2zpCAcNCj3NfMqe38OjxEs4hnsgI2ZzAMNu9D0zvf7HkK/a3WS0msjPEGtuY1syk4hWq d6JEwc51L32+yrkbXDuImqwJJ0/EPu1rnWhdSMJ44+LVbckUIs7sZQceWQSDmqrwt8zzCRFKfBc92Y DBRyaQRCzNGuQo1TpNA4r/t999p4QP+WJu/08kFk4QdjqIiaakTrA3MRq6orFwoNDYNNf7t9ElWmIf svP+1tMjuBJXeSGRg2zON97FBik9IJ8l3dKenP1KnO+BJZ8eytG1qgHtjRCV3LxbifHL4AJPLn9aJr EjvwJa+l953lbz3xVmII+QbtSAYxAelJMHhyqRZcfbkVPEF55wLSBHUYlpMQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-input@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-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 ");