From patchwork Thu Jun 29 09:27:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 114259 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9514728vqr; Thu, 29 Jun 2023 02:49:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7q4C22DPYXNzMiIb+eAdkoH3Qp8jXIpmqVfKO6lvpXJOlwnKDBA8IjouZZvjh3YKDV8AN8 X-Received: by 2002:a05:6a20:7da6:b0:11b:3e33:d2ce with SMTP id v38-20020a056a207da600b0011b3e33d2cemr46758480pzj.1.1688032177022; Thu, 29 Jun 2023 02:49:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688032177; cv=none; d=google.com; s=arc-20160816; b=PBDiQtV9D5DeSMzEhWLwUDmeoa+ZpsLkaMxpkH0BbuMi9irpw1zr2MGERysWETTnLN tZrC5YJpEFpeZSwOoAki18VmUNOYXWWxfronhiLPqqVTmczfSz1iqazlg+dz54tqXRMB qPMtLeFLe57x3QtfXuXOY9UZTPbfDYCcwFEfWasQZKY4ACm94CtreBPqXejBc603FuBw SX5nNGaMD1FKaBA+8qvDYQUu4hBRevasfGgjbSY15CMU0jQgIhcm1Veh5dE47Nz5n9kP OLBYLILBXthAKZOXve+zc/q+g8JbAjD9nb3amckjQbQyaHxORiBeCSFAxCoqsbjmTn6k FR2w== 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=31dDSPmTEwAk2xBEYscYsgGP3NvqtS1pbeFP7C1NdB4=; fh=JD0yLHzogLAuOcYWhhxx2HlW+uXYASEo0iLqGoMycFw=; b=d/S7ZpnECbnTzaAL90AJVtaqv7YfMUxTMVdByRQIUP8CLCrmTSOq14UvJ5aSi5tqsS WxV+u4/fi0LqsqoKYIH/h4yADFLt2UIokLMN/9tG7+DBVCFbLs/G55PJZm8ZRE53Y1FG PsbBi0ITjEW/XpBdVOxTdArfHxmoWWcK0DVm6dgS6wVQpxWURyxxd/UFEG+ZLsGD3KC0 w0N0ncjMSdzAvrODmryiaWYBRw69U6+mHnZwDr0efZPB4EMBMLh6WwHtR5wItvvo4O8K P5BahpYXe+JRgYtPL6g+0KjmmH6zZYHrep/0sMWGh2BsreoV5fqlBL4DxpHovfVG/jeR kWaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xoL9nHEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g63-20020a636b42000000b0055798b90375si9385496pgc.709.2023.06.29.02.49.22; Thu, 29 Jun 2023 02:49:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xoL9nHEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232507AbjF2J11 (ORCPT + 99 others); Thu, 29 Jun 2023 05:27:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232338AbjF2J1U (ORCPT ); Thu, 29 Jun 2023 05:27:20 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D91B1BE1 for ; Thu, 29 Jun 2023 02:27:18 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3112f5ab0b1so440091f8f.0 for ; Thu, 29 Jun 2023 02:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688030836; x=1690622836; 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=31dDSPmTEwAk2xBEYscYsgGP3NvqtS1pbeFP7C1NdB4=; b=xoL9nHEBMMPLXgUGrd9HzmGNF7olI2VB1dla0Wr/y/6DUsz8N0Du40RBGu4WeJOnhq c2FIiKV2fHiONWdOpDQlwGWaeaGRGBvAqLCchqBa7x82e318ro3yoFe6LU72GH4QEnWq Khge3rLSzy2LNYIQaI+1wURIy65JwXnwCVkUuns9Su3qejnbJTpaLCiwzBM/jh7OAPE2 JssSfuer0h/vGrAg6af4JiLohtjFtQr7kOZnB0DeprUvidEM8DG0By6YxrmCzu9pxTfu yY1LpRS33hlpjGuVav5d0U/AqxkszlNSlr4ePyubLlkDQ0GMc/ALy581E6rJmJiyQarH ngAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688030836; x=1690622836; 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=31dDSPmTEwAk2xBEYscYsgGP3NvqtS1pbeFP7C1NdB4=; b=a1SpMsmeeT+qBHhVFJQVqBlSh5REVTcA7hqe6yj6oXQ3BFS92VJauEYcumnG2fAJg1 Lox6kjt46Bbs4vVSpkLabvk7yCfcMl/ffUcAHbL5V1G8Vx3M+kKfJfQ0dRhTzHWELfME QDkZBg4ftP9zC1d6EDtCGiiJH0h+tFvm0yBGWiWP4MfqLZ5GT/0l0nEROzoLLYZt7eWQ j5sMRsoDO/wI+NEkUtMX2CE1Ux9u7aLdCIthBTmc8RmudzzrRHYkSwGkqa/rLsQ5dnWa Xu7JYNpcW+uPTJYOTJhw0LkmGPgAjwpGP6mrGAu1NXS7+x3C9HXMhOMp7u/EXOvJuohr wsrw== X-Gm-Message-State: AC+VfDwhjS3tw7HH11GyAuBAIvtZpY25Jcg0vsmyi/V2oPH9qkJkTGRX nDuv1V/FaWReZLGLguScfNWv2Q== X-Received: by 2002:a05:600c:22d2:b0:3f9:b297:1804 with SMTP id 18-20020a05600c22d200b003f9b2971804mr21295637wmg.17.1688030836346; Thu, 29 Jun 2023 02:27:16 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id s4-20020adfea84000000b002ca864b807csm15800172wrm.0.2023.06.29.02.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 02:27:15 -0700 (PDT) From: Neil Armstrong Date: Thu, 29 Jun 2023 11:27:10 +0200 Subject: [PATCH v4 1/4] dt-bindings: input: document Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20230606-topic-goodix-berlin-upstream-initial-v4-1-0947c489be17@linaro.org> References: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> In-Reply-To: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy Cc: linux-input@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong , Rob Herring X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3093; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=sfk9uxvNPIwk9f8d5iBn9m2N4nTZgMQFpRmAil1gnVU=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBknU5wV3PpOBEOPmwhmka9C/nUAM1mrtWNjVtwtcxA sl+NRXeJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJ1OcAAKCRB33NvayMhJ0b5jD/ 9KVUiblZUnHxPDlz1t/Dm9T/JJ5AFtRsNMwcS6Ru57/soLvNWvPDXbDqFL/9Zc6k+Y3p7BAf33lET4 is02Junwh/koPxik/cuNQkd/g2Edma4AImRGTdqd/NyGSSu4brlFCwd/9kbagHHb+3wWK6zqs794zA SSRiE2wNrnex7a4IM91HHY/6TbbOiwx37g1Bpw/D7nIv9GBlFyU2rgoCuQnFLLakxgtnHQZFVphupZ yPuL+trrbqBdTeMXqZOnwQweGwDKvQ37Ubqv1I8aRS1+INLq90rGYjvoqRXBWUoYBvrdJ0KGK2LWSX h2o77umT+rina3TQywmvON06jmTd9GxXjcKcsjOjV3ioc7Yf6uGEPCYDR0I582poLnlhGAnoAHplNM IUS6+Arhk8XekjI2B3nBuEJzyhAAH5s/TywkBpJtbJCPgMBd65teaF/AwMX4oooYfb9Bjt79wdluRI Df+4TbxJK1Yiuf0Kk3AIrWddp6J4ODYwHoA0KXCmDuzmWa7rqFtyVv0l4uE2nTpnjD6+//24p6Hho0 xCaklJHLnnyswZ2+Q9sPmmAw8/O1npV+3qyBw2b/oSmkRiNRS6N1zQ+zOs1FHEhZq2yRTk8RXUysXK CmDzpccmdAtjz4sxBBZ9Ltmz3dqTnWCNLBOelIcwzjEEI+4xYF7y7ZBZSjHA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770030027838713500?= X-GMAIL-MSGID: =?utf-8?q?1770030027838713500?= Document the Goodix GT9916 wich is part of the "Berlin" serie of Touchscreen controllers IC from Goodix. Reviewed-by: Rob Herring Signed-off-by: Neil Armstrong --- .../bindings/input/touchscreen/goodix,gt9916.yaml | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/Documentation/devicetree/bindings/input/touchscreen/goodix,gt9916.yaml b/Documentation/devicetree/bindings/input/touchscreen/goodix,gt9916.yaml new file mode 100644 index 000000000000..d90f045ac06c --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/goodix,gt9916.yaml @@ -0,0 +1,95 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/touchscreen/goodix,gt9916.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Goodix Berlin series touchscreen controller + +description: The Goodix Berlin series of touchscreen controllers + be connected to either I2C or SPI buses. + +maintainers: + - Neil Armstrong + +allOf: + - $ref: touchscreen.yaml# + - $ref: /schemas/spi/spi-peripheral-props.yaml# + +properties: + compatible: + enum: + - goodix,gt9916 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + reset-gpios: + maxItems: 1 + + avdd-supply: + description: Analog power supply regulator on AVDD pin + + vddio-supply: + description: power supply regulator on VDDIO pin + + spi-max-frequency: true + touchscreen-inverted-x: true + touchscreen-inverted-y: true + touchscreen-size-x: true + touchscreen-size-y: true + touchscreen-swapped-x-y: true + +additionalProperties: false + +required: + - compatible + - reg + - interrupts + - avdd-supply + - touchscreen-size-x + - touchscreen-size-y + +examples: + - | + #include + #include + i2c { + #address-cells = <1>; + #size-cells = <0>; + touchscreen@5d { + compatible = "goodix,gt9916"; + reg = <0x5d>; + interrupt-parent = <&gpio>; + interrupts = <25 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + avdd-supply = <&ts_avdd>; + touchscreen-size-x = <1024>; + touchscreen-size-y = <768>; + }; + }; + - | + #include + #include + spi { + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + cs-gpios = <&gpio 2 GPIO_ACTIVE_HIGH>; + touchscreen@0 { + compatible = "goodix,gt9916"; + reg = <0>; + interrupt-parent = <&gpio>; + interrupts = <25 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + avdd-supply = <&ts_avdd>; + spi-max-frequency = <1000000>; + touchscreen-size-x = <1024>; + touchscreen-size-y = <768>; + }; + }; + +... From patchwork Thu Jun 29 09:27:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 114260 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9515040vqr; Thu, 29 Jun 2023 02:50:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VoVRDwz3/dJASXYfCI/W3ldBwFRoN8F7eUkGKAzz3TKZMjdgVUUdvmuRgT/qhjX2T4Xjm X-Received: by 2002:a05:6a00:24cf:b0:676:2a5c:7bc5 with SMTP id d15-20020a056a0024cf00b006762a5c7bc5mr13763716pfv.1.1688032227810; Thu, 29 Jun 2023 02:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688032227; cv=none; d=google.com; s=arc-20160816; b=h6owjiRFupcnC1HvV2wQNRYVHk10o7LVubdribsL8nkTkmPiyWcrin+//m+zwKzjkn 8ZLPx3/LtCg8JrJ5fCr7dJ73+37JAYOeOPesAinL2aH5082I2Ysx+cpY8c/E0nR1yaT4 TCRoEzL4SyFD1c6Hw+eloJtSliIFgq1GM9h21W/sKCn3sgShrkrmNoysxrnaZ19Kv38z fUzknuj2ruIZsuGtGoaCJlwzYWhD8T4HAfbePXtSX3cTBqgDDwowzQ3wO/SyNNN6iR6U qcIYW83WYrFU3CrI5lsIYYICwV9QTLp4WjxSSIa0OrNw5/+fqYiaE/TMHQ+0n2TVw9v6 kbeQ== 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=qsyZ5XHiUE0/Oqf4+6hZcwgUc1gPdLDmDJruqBhOZyQ=; fh=w4faXQm1q1Gh1kuBhZC0K/Cre03aBtXVbTnNr8BSNRA=; b=v/4Xqh3G3yM/g/WGRx1FoepyMoUARfwy9pjIbfwT/5oKBbpqycXQ8/zbhW5paKuZg0 tug6FmmdUPhxC5lTOUZtUqJHet0hkJrbrnL+GW1tBSqpwDW6RN5x0VU4rheCzDC+peq1 AnGdkvvKeL2mRvh/qkxMSMs7GvpCqu6QYEkdBnbJGRBJSnBfs8fCMyhugm4x6fGa4Xp/ QiTwLsMNzZeOWmCAftHH2MpsFLj2aVp4lgGvd5Owuez8StVUfN9IwBSAhLXkSmk9j+Fd xNvEKZ9OcIS4B6WhVa3jnvrYXbWjtAaQzeprk3GEehKYgALhxtLVgRt/71ZLuRWeQiDY gvIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FLU7lB1i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dw25-20020a056a00369900b0066d45f035a6si9129301pfb.272.2023.06.29.02.50.12; Thu, 29 Jun 2023 02:50:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FLU7lB1i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232516AbjF2J1f (ORCPT + 99 others); Thu, 29 Jun 2023 05:27:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232399AbjF2J1W (ORCPT ); Thu, 29 Jun 2023 05:27:22 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A013268A for ; Thu, 29 Jun 2023 02:27:19 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fb7dc16ff0so696484e87.2 for ; Thu, 29 Jun 2023 02:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688030837; x=1690622837; 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=qsyZ5XHiUE0/Oqf4+6hZcwgUc1gPdLDmDJruqBhOZyQ=; b=FLU7lB1ibR4hA8LUtMh+2NrWnSzyUKPHI7T2Akxku0NEXwgoEAtzDSJ6E/tQWIGiKl cJk8ugAaN4oPu6H/ZcOnjZP7BABbiQS/xjKMmBt2ql5Wut6HlEMgXoQE3j8fq9cCVpFP Q4/uIHIFwuq125IA8bUDh0snJYIpfKAxJE7YsemKfxb6JWBfhYYLE5dFMDQE8Sbvywlo nAWPX+z7Rj6AO9u5844ZgsgM9o9Grh5tcWiT3X6fRzJJsDoV1axg+t7Xk2mk46Gi+J/D Rp3ASnfCIpuTXMy3pfO85pHnS0dbF7bjO5x4cO9oDFBZwlq6dLDBbYRk9ELrIK71y6IZ 25ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688030837; x=1690622837; 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=qsyZ5XHiUE0/Oqf4+6hZcwgUc1gPdLDmDJruqBhOZyQ=; b=S0v3rGkp9R0LNH2gucu8fWTPnHK9o/h1gczp+j/bethCqnuAdBzcb78WpRbEMKSSfc SelJvCj10shW08934gWux6IiLr7CMrnHKXtO9yqbkm+BUdIVajmupIEjk0f1oUmbqR/J cjAP/TFW7bXGlQiAOeg9UoT2ZZ7rP+JiZWXdT5L3bM908pIyPaMqZhO8JlsMAvVndQPa TRZQa41NKS1pEqgqt0BAxf/+YftB5fVmJ/s+lDzKByZ0YZ60CSWKZw0OC5Xn30lQdW1b lKvhsFS0trKLPdt5bVjRkMNuwfbj1u4uh0IkKp5z6i/nNREUOBGO7ZwYoHfms6uc9DCm EXAg== X-Gm-Message-State: AC+VfDyAQaggMeTVu/mkZIB45bE5JNf0XaBNmouPtekBnl0Q+67VNciP mYENeosQsfzJYa6kxrP1da3UTw== X-Received: by 2002:a19:4f49:0:b0:4f8:5ede:d452 with SMTP id a9-20020a194f49000000b004f85eded452mr18485371lfk.55.1688030837365; Thu, 29 Jun 2023 02:27:17 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id s4-20020adfea84000000b002ca864b807csm15800172wrm.0.2023.06.29.02.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 02:27:16 -0700 (PDT) From: Neil Armstrong Date: Thu, 29 Jun 2023 11:27:11 +0200 Subject: [PATCH v4 2/4] input: touchscreen: add core support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20230606-topic-goodix-berlin-upstream-initial-v4-2-0947c489be17@linaro.org> References: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> In-Reply-To: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy 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=22945; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=IsOLPCX+TXYX/xWB8n+n0ZBQ70DwF/3WqJo7JTeliZ0=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBknU5xsbjVTADNT7AH3e4+vvW7PO9aAzeGtN3xGkh5 esmu6YiJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJ1OcQAKCRB33NvayMhJ0V4ID/ 9YB2xit+WPgG+OFFY9fPrPpd3Zdk/cfnsiWQ6KDqj8h1y5KUfSnPTbo9T0iUYgBLbvffDaeDsUL6UJ 2a1eUf1ddEhPPCysAUxbkwKxKzfhPGAz7RmN+AYF+tlZq+1qC/TJC7XPsIADihum9cJa/+xrGNqh6y h0HnD/YWAU4jTS02XyF/NFG+dLzH6C5MYA2J+14znqrbPahApkLxZf0Z9e4mvWFRXPFUT/fNkgdRjh ZVD1oYztXsgZwnUU8lb1gp29VaeErvhmVerNF0Lu34tmr6hdjJ9H+sEFzpd/uCITuXhpvEqq5oVMTW r5GxDyIkKmthJq4WAXDYFTIdOu6J7Qtfi6Kve744mxxh6s1RCn4o1jpWxq9Aph6QWri/2nsxIOV6fD QDAJ8cLEpBYpOJfjZndepmTN52NeFWyq0I4N4aDMa/KgN9OI4NRlDfJ8qGd49xvIzDRj/RK05+btJr wsnTJRtfQrFwBhRK0v5tfqs7jlHWyHcrmNWSgivZRHPoi+xsq4883WZkpMZFKpaaa2xkVMeINjAEz2 z7fDmyGgpQOAwoSGG/ONsPavok9z5TMzj2PoRaox7oG0JiVytf6Vh8CGS1gnB/higqeBoPMMj2Uahd Q51TeEv4z9Fb9ekTmx3EVVVuwpUYuJ02Z8O5AkweYLa6fvZs6RkHLpFWsFvQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770030081103749503?= X-GMAIL-MSGID: =?utf-8?q?1770030081103749503?= Add initial support for the new Goodix "Berlin" touchscreen ICs. These touchscreen ICs support SPI, I2C and I3C interface, up to 10 finger touch, stylus and gestures events. 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. Support for advanced features like: - Firmware & config update - Stylus events - Gestures events - Previous revisions support (BerlinA or BerlinB) is not included in current version. The current support will work with currently flashed firmware and config, and bail out if firmware or config aren't flashed yet. [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 | 3 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/goodix_berlin.h | 159 +++++++ drivers/input/touchscreen/goodix_berlin_core.c | 581 +++++++++++++++++++++++++ 4 files changed, 744 insertions(+) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index c2cbd332af1d..f6ed3f334447 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -416,6 +416,9 @@ config TOUCHSCREEN_GOODIX To compile this driver as a module, choose M here: the module will be called goodix. +config TOUCHSCREEN_GOODIX_BERLIN_CORE + tristate + config TOUCHSCREEN_HIDEEP tristate "HiDeep Touch IC" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 159cd5136fdb..29cdb042e104 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_TOUCHSCREEN_EGALAX_SERIAL) += egalax_ts_serial.o 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_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.h b/drivers/input/touchscreen/goodix_berlin.h new file mode 100644 index 000000000000..235f44947a28 --- /dev/null +++ b/drivers/input/touchscreen/goodix_berlin.h @@ -0,0 +1,159 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Goodix Touchscreen Driver + * Copyright (C) 2020 - 2021 Goodix, Inc. + * Copyright (C) 2023 Linaro Ltd. + * + * Based on goodix_berlin_berlin driver. + */ + +#ifndef __GOODIX_BERLIN_H_ +#define __GOODIX_BERLIN_H_ + +#include +#include +#include +#include +#include + +#define GOODIX_BERLIN_MAX_TOUCH 10 + +#define GOODIX_BERLIN_NORMAL_RESET_DELAY_MS 100 + +#define GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN 8 +#define GOODIX_BERLIN_STATUS_OFFSET 0 +#define GOODIX_BERLIN_REQUEST_TYPE_OFFSET 2 + +#define GOODIX_BERLIN_BYTES_PER_POINT 8 +#define GOODIX_BERLIN_COOR_DATA_CHECKSUM_SIZE 2 +#define GOODIX_BERLIN_COOR_DATA_CHECKSUM_MASK GENMASK(15, 0) + +/* Read n finger events */ +#define GOODIX_BERLIN_IRQ_READ_LEN(n) (GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN + \ + (GOODIX_BERLIN_BYTES_PER_POINT * (n)) + \ + GOODIX_BERLIN_COOR_DATA_CHECKSUM_SIZE) + +#define GOODIX_BERLIN_TOUCH_EVENT BIT(7) +#define GOODIX_BERLIN_REQUEST_EVENT BIT(6) +#define GOODIX_BERLIN_TOUCH_COUNT_MASK GENMASK(3, 0) + +#define GOODIX_BERLIN_REQUEST_CODE_RESET 3 + +#define GOODIX_BERLIN_POINT_TYPE_MASK GENMASK(3, 0) +#define GOODIX_BERLIN_POINT_TYPE_STYLUS_HOVER 1 +#define GOODIX_BERLIN_POINT_TYPE_STYLUS 3 + +#define GOODIX_BERLIN_TOUCH_ID_MASK GENMASK(7, 4) + +#define GOODIX_BERLIN_DEV_CONFIRM_VAL 0xAA +#define GOODIX_BERLIN_BOOTOPTION_ADDR 0x10000 +#define GOODIX_BERLIN_FW_VERSION_INFO_ADDR 0x10014 + +#define GOODIX_BERLIN_IC_INFO_MAX_LEN SZ_1K +#define GOODIX_BERLIN_IC_INFO_ADDR 0x10070 + +struct goodix_berlin_fw_version { + u8 rom_pid[6]; + u8 rom_vid[3]; + u8 rom_vid_reserved; + u8 patch_pid[8]; + u8 patch_vid[4]; + u8 patch_vid_reserved; + u8 sensor_id; + u8 reserved[2]; + __le16 checksum; +} __packed; + +struct goodix_berlin_ic_info_version { + u8 info_customer_id; + u8 info_version_id; + u8 ic_die_id; + u8 ic_version_id; + __le32 config_id; + u8 config_version; + u8 frame_data_customer_id; + u8 frame_data_version_id; + u8 touch_data_customer_id; + u8 touch_data_version_id; + u8 reserved[3]; +} __packed; + +struct goodix_berlin_ic_info_feature { + __le16 freqhop_feature; + __le16 calibration_feature; + __le16 gesture_feature; + __le16 side_touch_feature; + __le16 stylus_feature; +} __packed; + +struct goodix_berlin_ic_info_misc { + __le32 cmd_addr; + __le16 cmd_max_len; + __le32 cmd_reply_addr; + __le16 cmd_reply_len; + __le32 fw_state_addr; + __le16 fw_state_len; + __le32 fw_buffer_addr; + __le16 fw_buffer_max_len; + __le32 frame_data_addr; + __le16 frame_data_head_len; + __le16 fw_attr_len; + __le16 fw_log_len; + u8 pack_max_num; + u8 pack_compress_version; + __le16 stylus_struct_len; + __le16 mutual_struct_len; + __le16 self_struct_len; + __le16 noise_struct_len; + __le32 touch_data_addr; + __le16 touch_data_head_len; + __le16 point_struct_len; + __le16 reserved1; + __le16 reserved2; + __le32 mutual_rawdata_addr; + __le32 mutual_diffdata_addr; + __le32 mutual_refdata_addr; + __le32 self_rawdata_addr; + __le32 self_diffdata_addr; + __le32 self_refdata_addr; + __le32 iq_rawdata_addr; + __le32 iq_refdata_addr; + __le32 im_rawdata_addr; + __le16 im_readata_len; + __le32 noise_rawdata_addr; + __le16 noise_rawdata_len; + __le32 stylus_rawdata_addr; + __le16 stylus_rawdata_len; + __le32 noise_data_addr; + __le32 esd_addr; +} __packed; + +struct goodix_berlin_touch_data { + u8 id; + u8 unused; + __le16 x; + __le16 y; + __le16 w; +} __packed; + +struct goodix_berlin_core { + struct device *dev; + struct regmap *regmap; + struct regulator *avdd; + struct regulator *iovdd; + struct gpio_desc *reset_gpio; + struct touchscreen_properties props; + struct goodix_berlin_fw_version fw_version; + struct input_dev *input_dev; + int irq; + + /* Runtime parameters extracted from IC_INFO buffer */ + u32 touch_data_addr; +}; + +int goodix_berlin_probe(struct device *dev, int irq, const struct input_id *id, + struct regmap *regmap); + +extern const struct dev_pm_ops goodix_berlin_pm_ops; + +#endif diff --git a/drivers/input/touchscreen/goodix_berlin_core.c b/drivers/input/touchscreen/goodix_berlin_core.c new file mode 100644 index 000000000000..08c508677669 --- /dev/null +++ b/drivers/input/touchscreen/goodix_berlin_core.c @@ -0,0 +1,581 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Goodix 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" + +/* + * Goodix "Berlin" Touchscreen ID driver + * + * This driver is distinct from goodix.c since hardware interface + * is different enough to require a new driver. + * None of the register address or data structure are close enough + * to the previous generations. + * + * Currently only handles Multitouch events with already + * programmed firmware and "config" for "Revision D" Berlin IC. + * + * Support is missing for: + * - ESD Management + * - Firmware update/flashing + * - "Config" update/flashing + * - Stylus Events + * - Gesture Events + * - Support for older revisions (A & B) + */ + +static bool goodix_berlin_checksum_valid(const u8 *data, int size) +{ + u32 cal_checksum = 0; + u16 r_checksum; + u32 i; + + if (size < GOODIX_BERLIN_COOR_DATA_CHECKSUM_SIZE) + return false; + + for (i = 0; i < size - GOODIX_BERLIN_COOR_DATA_CHECKSUM_SIZE; i++) + cal_checksum += data[i]; + + r_checksum = get_unaligned_le16(&data[i]); + + return FIELD_GET(GOODIX_BERLIN_COOR_DATA_CHECKSUM_MASK, cal_checksum) == r_checksum; +} + +static bool goodix_berlin_is_dummy_data(struct goodix_berlin_core *cd, + const u8 *data, int size) +{ + int i; + + /* + * If the device is missing or doesn't respond the buffer + * could be filled with bus default line state, 0x00 or 0xff, + * so declare success the first time we encounter neither. + */ + for (i = 0; i < size; i++) + if (data[i] > 0 && data[i] < 0xff) + return false; + + return true; +} + +static int goodix_berlin_dev_confirm(struct goodix_berlin_core *cd) +{ + u8 tx_buf[8], rx_buf[8]; + int retry = 3; + int error; + + memset(tx_buf, GOODIX_BERLIN_DEV_CONFIRM_VAL, sizeof(tx_buf)); + while (retry--) { + error = regmap_raw_write(cd->regmap, GOODIX_BERLIN_BOOTOPTION_ADDR, tx_buf, + sizeof(tx_buf)); + if (error) + return error; + + error = regmap_raw_read(cd->regmap, GOODIX_BERLIN_BOOTOPTION_ADDR, rx_buf, + sizeof(rx_buf)); + if (error) + return error; + + if (!memcmp(tx_buf, rx_buf, sizeof(tx_buf))) + return 0; + + usleep_range(5000, 5100); + } + + dev_err(cd->dev, "device confirm failed, rx_buf: %*ph\n", 8, rx_buf); + + return -EINVAL; +} + +static int goodix_berlin_power_on(struct goodix_berlin_core *cd, bool on) +{ + int error = 0; + + if (on) { + error = regulator_enable(cd->iovdd); + if (error) { + dev_err(cd->dev, "Failed to enable iovdd: %d\n", error); + return error; + } + + /* Vendor waits 3ms for IOVDD to settle */ + usleep_range(3000, 3100); + + error = regulator_enable(cd->avdd); + if (error) { + dev_err(cd->dev, "Failed to enable avdd: %d\n", error); + goto err_iovdd_disable; + } + + /* Vendor waits 15ms for IOVDD to settle */ + usleep_range(15000, 15100); + + gpiod_set_value(cd->reset_gpio, 0); + + /* Vendor waits 4ms for Firmware to initialize */ + usleep_range(4000, 4100); + + error = goodix_berlin_dev_confirm(cd); + if (error) + goto err_dev_reset; + + /* Vendor waits 100ms for Firmware to fully boot */ + msleep(GOODIX_BERLIN_NORMAL_RESET_DELAY_MS); + + return 0; + } + +err_dev_reset: + gpiod_set_value(cd->reset_gpio, 1); + + regulator_disable(cd->avdd); + +err_iovdd_disable: + regulator_disable(cd->iovdd); + + return error; +} + +static int goodix_berlin_read_version(struct goodix_berlin_core *cd) +{ + u8 buf[sizeof(struct goodix_berlin_fw_version)]; + int error; + + error = regmap_raw_read(cd->regmap, GOODIX_BERLIN_FW_VERSION_INFO_ADDR, buf, sizeof(buf)); + if (error) { + dev_err(cd->dev, "error reading fw version, %d\n", error); + return error; + } + + if (!goodix_berlin_checksum_valid(buf, sizeof(buf))) { + dev_err(cd->dev, "invalid fw version: checksum error\n"); + return -EINVAL; + } + + memcpy(&cd->fw_version, buf, sizeof(cd->fw_version)); + + return 0; +} + +/* Only extract necessary data for runtime */ +static int goodix_berlin_convert_ic_info(struct goodix_berlin_core *cd, + const u8 *data, u16 length) +{ + struct goodix_berlin_ic_info_misc misc; + unsigned int offset = 0; + u8 param_num; + + offset += sizeof(__le16); /* length */ + offset += sizeof(struct goodix_berlin_ic_info_version); + offset += sizeof(struct goodix_berlin_ic_info_feature); + + /* IC_INFO Parameters, variable width structure */ + offset += 4 * sizeof(u8); /* drv_num, sen_num, button_num, force_num */ + + if (offset >= length) + goto invalid_offset; + + param_num = data[offset++]; /* active_scan_rate_num */ + + offset += param_num * sizeof(__le16); + + if (offset >= length) + goto invalid_offset; + + param_num = data[offset++]; /* mutual_freq_num*/ + + offset += param_num * sizeof(__le16); + + if (offset >= length) + goto invalid_offset; + + param_num = data[offset++]; /* self_tx_freq_num */ + + offset += param_num * sizeof(__le16); + + if (offset >= length) + goto invalid_offset; + + param_num = data[offset++]; /* self_rx_freq_num */ + + offset += param_num * sizeof(__le16); + + if (offset >= length) + goto invalid_offset; + + param_num = data[offset++]; /* stylus_freq_num */ + + offset += param_num * sizeof(__le16); + + if (offset + sizeof(misc) > length) + goto invalid_offset; + + /* goodix_berlin_ic_info_misc */ + memcpy(&misc, &data[offset], sizeof(misc)); + + cd->touch_data_addr = le32_to_cpu(misc.touch_data_addr); + + return 0; + +invalid_offset: + dev_err(cd->dev, "ic_info length is invalid (offset %d length %d)\n", + offset, length); + return -EINVAL; +} + +static int goodix_berlin_get_ic_info(struct goodix_berlin_core *cd) +{ + u8 afe_data[GOODIX_BERLIN_IC_INFO_MAX_LEN]; + __le16 length_raw; + u16 length; + int error; + + error = regmap_raw_read(cd->regmap, GOODIX_BERLIN_IC_INFO_ADDR, + &length_raw, sizeof(length_raw)); + if (error) { + dev_info(cd->dev, "failed get ic info length, %d\n", error); + return error; + } + + length = le16_to_cpu(length_raw); + if (length >= GOODIX_BERLIN_IC_INFO_MAX_LEN) { + dev_info(cd->dev, "invalid ic info length %d\n", length); + return -EINVAL; + } + + error = regmap_raw_read(cd->regmap, GOODIX_BERLIN_IC_INFO_ADDR, + afe_data, length); + if (error) { + dev_info(cd->dev, "failed get ic info data, %d\n", error); + return error; + } + + /* check whether the data is valid (ex. bus default values) */ + if (goodix_berlin_is_dummy_data(cd, (const uint8_t *)afe_data, length)) { + dev_err(cd->dev, "fw info data invalid\n"); + return -EINVAL; + } + + if (!goodix_berlin_checksum_valid((const uint8_t *)afe_data, length)) { + dev_info(cd->dev, "fw info checksum error\n"); + return -EINVAL; + } + + error = goodix_berlin_convert_ic_info(cd, afe_data, length); + if (error) + return error; + + /* check some key info */ + if (!cd->touch_data_addr) { + dev_err(cd->dev, "touch_data_addr is null\n"); + return -EINVAL; + } + + return 0; +} + +static void goodix_berlin_parse_finger(struct goodix_berlin_core *cd, + const void *buf, int touch_num) +{ + const struct goodix_berlin_touch_data *touch_data = buf; + int i; + + /* Check for data validity */ + for (i = 0; i < touch_num; i++) { + unsigned int id; + + id = FIELD_GET(GOODIX_BERLIN_TOUCH_ID_MASK, touch_data[i].id); + + if (id >= GOODIX_BERLIN_MAX_TOUCH) { + dev_warn(cd->dev, "invalid finger id %d\n", id); + return; + } + } + + /* Report finger touches */ + for (i = 0; i < touch_num; i++) { + input_mt_slot(cd->input_dev, + FIELD_GET(GOODIX_BERLIN_TOUCH_ID_MASK, + touch_data[i].id)); + input_mt_report_slot_state(cd->input_dev, MT_TOOL_FINGER, true); + + touchscreen_report_pos(cd->input_dev, &cd->props, + __le16_to_cpu(touch_data[i].x), + __le16_to_cpu(touch_data[i].y), + true); + input_report_abs(cd->input_dev, ABS_MT_TOUCH_MAJOR, + __le16_to_cpu(touch_data[i].w)); + } + + input_mt_sync_frame(cd->input_dev); + input_sync(cd->input_dev); +} + +static void goodix_berlin_touch_handler(struct goodix_berlin_core *cd, + const void *pre_buf, u32 pre_buf_len) +{ + static u8 buffer[GOODIX_BERLIN_IRQ_READ_LEN(GOODIX_BERLIN_MAX_TOUCH)]; + u8 point_type, touch_num; + int error; + + /* copy pre-data to buffer */ + memcpy(buffer, pre_buf, pre_buf_len); + + touch_num = FIELD_GET(GOODIX_BERLIN_TOUCH_COUNT_MASK, + buffer[GOODIX_BERLIN_REQUEST_TYPE_OFFSET]); + + if (touch_num > GOODIX_BERLIN_MAX_TOUCH) { + dev_warn(cd->dev, "invalid touch num %d\n", touch_num); + return; + } + + if (touch_num) { + /* read more data if more than 2 touch events */ + if (unlikely(touch_num > 2)) { + error = regmap_raw_read(cd->regmap, + cd->touch_data_addr + pre_buf_len, + &buffer[pre_buf_len], + (touch_num - 2) * GOODIX_BERLIN_BYTES_PER_POINT); + if (error) { + dev_err_ratelimited(cd->dev, "failed to get touch data, %d\n", + error); + return; + } + } + + point_type = FIELD_GET(GOODIX_BERLIN_POINT_TYPE_MASK, + buffer[GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN]); + + if (point_type == GOODIX_BERLIN_POINT_TYPE_STYLUS || + point_type == GOODIX_BERLIN_POINT_TYPE_STYLUS_HOVER) { + dev_warn_once(cd->dev, "Stylus event type not handled\n"); + return; + } + + if (!goodix_berlin_checksum_valid(&buffer[GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN], + touch_num * GOODIX_BERLIN_BYTES_PER_POINT + 2)) { + dev_err(cd->dev, "touch data checksum error, data: %*ph\n", + touch_num * GOODIX_BERLIN_BYTES_PER_POINT + 2, + &buffer[GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN]); + return; + } + } + + goodix_berlin_parse_finger(cd, &buffer[GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN], + touch_num); +} + +static int goodix_berlin_request_handle_reset(struct goodix_berlin_core *cd) +{ + gpiod_set_value(cd->reset_gpio, 1); + usleep_range(2000, 2100); + gpiod_set_value(cd->reset_gpio, 0); + + msleep(GOODIX_BERLIN_NORMAL_RESET_DELAY_MS); + + return 0; +} + +static irqreturn_t goodix_berlin_threadirq_func(int irq, void *data) +{ + struct goodix_berlin_core *cd = data; + u8 buf[GOODIX_BERLIN_IRQ_READ_LEN(2)]; + u8 event_status; + int error; + + /* First, read buffer with space for 2 touch events */ + error = regmap_raw_read(cd->regmap, cd->touch_data_addr, buf, + GOODIX_BERLIN_IRQ_READ_LEN(2)); + if (error) { + dev_err_ratelimited(cd->dev, "failed get event head data, %d\n", error); + return IRQ_HANDLED; + } + + if (buf[GOODIX_BERLIN_STATUS_OFFSET] == 0) + return IRQ_HANDLED; + + if (!goodix_berlin_checksum_valid(buf, GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN)) { + dev_warn_ratelimited(cd->dev, "touch head checksum err : %*ph\n", + GOODIX_BERLIN_IRQ_EVENT_HEAD_LEN, buf); + return IRQ_HANDLED; + } + + event_status = buf[GOODIX_BERLIN_STATUS_OFFSET]; + + if (event_status & GOODIX_BERLIN_TOUCH_EVENT) + goodix_berlin_touch_handler(cd, buf, GOODIX_BERLIN_IRQ_READ_LEN(2)); + + if (event_status & GOODIX_BERLIN_REQUEST_EVENT) { + switch (buf[GOODIX_BERLIN_REQUEST_TYPE_OFFSET]) { + case GOODIX_BERLIN_REQUEST_CODE_RESET: + goodix_berlin_request_handle_reset(cd); + break; + + default: + dev_warn(cd->dev, "unsupported request code 0x%x\n", + buf[GOODIX_BERLIN_REQUEST_TYPE_OFFSET]); + } + } + + /* Clear up status field */ + regmap_write(cd->regmap, cd->touch_data_addr, 0); + + return IRQ_HANDLED; +} + +static int goodix_berlin_input_dev_config(struct goodix_berlin_core *cd, + const struct input_id *id) +{ + struct input_dev *input_dev; + int error; + + input_dev = devm_input_allocate_device(cd->dev); + if (!input_dev) + return -ENOMEM; + + cd->input_dev = input_dev; + input_set_drvdata(input_dev, cd); + + input_dev->name = "Goodix Berlin Capacitive TouchScreen"; + input_dev->phys = "input/ts"; + + input_dev->id = *id; + + input_set_abs_params(cd->input_dev, ABS_MT_POSITION_X, 0, SZ_64K - 1, 0, 0); + input_set_abs_params(cd->input_dev, ABS_MT_POSITION_Y, 0, SZ_64K - 1, 0, 0); + input_set_abs_params(cd->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0); + + touchscreen_parse_properties(cd->input_dev, true, &cd->props); + + error = input_mt_init_slots(cd->input_dev, GOODIX_BERLIN_MAX_TOUCH, + INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED); + if (error) + return error; + + return input_register_device(cd->input_dev); +} + +static int goodix_berlin_pm_suspend(struct device *dev) +{ + struct goodix_berlin_core *cd = dev_get_drvdata(dev); + + disable_irq(cd->irq); + + return goodix_berlin_power_on(cd, false); +} + +static int goodix_berlin_pm_resume(struct device *dev) +{ + struct goodix_berlin_core *cd = dev_get_drvdata(dev); + int error; + + error = goodix_berlin_power_on(cd, true); + if (error) + return error; + + enable_irq(cd->irq); + + return 0; +} + +EXPORT_GPL_SIMPLE_DEV_PM_OPS(goodix_berlin_pm_ops, + goodix_berlin_pm_suspend, + goodix_berlin_pm_resume); + +static void goodix_berlin_power_off(void *data) +{ + struct goodix_berlin_core *cd = data; + + goodix_berlin_power_on(cd, false); +} + +int goodix_berlin_probe(struct device *dev, int irq, const struct input_id *id, + struct regmap *regmap) +{ + struct goodix_berlin_core *cd; + int error; + + if (irq <= 0) { + dev_err(dev, "Missing interrupt number\n"); + return -EINVAL; + } + + cd = devm_kzalloc(dev, sizeof(*cd), GFP_KERNEL); + if (!cd) + return -ENOMEM; + + cd->dev = dev; + cd->regmap = regmap; + cd->irq = irq; + + cd->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(cd->reset_gpio)) + return dev_err_probe(dev, PTR_ERR(cd->reset_gpio), + "Failed to request reset gpio\n"); + + cd->avdd = devm_regulator_get(dev, "avdd"); + if (IS_ERR(cd->avdd)) + return dev_err_probe(dev, PTR_ERR(cd->avdd), + "Failed to request avdd regulator\n"); + + cd->iovdd = devm_regulator_get(dev, "iovdd"); + if (IS_ERR(cd->iovdd)) + return dev_err_probe(dev, PTR_ERR(cd->iovdd), + "Failed to request iovdd regulator\n"); + + error = goodix_berlin_power_on(cd, true); + if (error) { + dev_err(dev, "failed power on"); + return error; + } + + error = devm_add_action_or_reset(dev, goodix_berlin_power_off, cd); + if (error) + return error; + + error = goodix_berlin_read_version(cd); + if (error) { + dev_err(dev, "failed to get version info"); + return error; + } + + error = goodix_berlin_get_ic_info(cd); + if (error) { + dev_err(dev, "invalid ic info, abort"); + return error; + } + + error = goodix_berlin_input_dev_config(cd, id); + if (error) { + dev_err(dev, "failed set input device"); + return error; + } + + error = devm_request_threaded_irq(dev, irq, NULL, + goodix_berlin_threadirq_func, + IRQF_ONESHOT, "goodix-berlin", cd); + if (error) { + dev_err(dev, "request threaded irq failed: %d\n", error); + return error; + } + + dev_set_drvdata(dev, cd); + + dev_dbg(dev, "Goodix Berlin %s Touchscreen Controller", cd->fw_version.patch_pid); + + return 0; +} +EXPORT_SYMBOL_GPL(goodix_berlin_probe); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Goodix Berlin Core Touchscreen driver"); +MODULE_AUTHOR("Neil Armstrong "); From patchwork Thu Jun 29 09:27:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 114265 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9521223vqr; Thu, 29 Jun 2023 03:04:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zcxDDoNS0COKXv10AzS51oIcZqlum3PIZStbFQf5ms7x9Mc+yQ2inU2mhifcAMZR6iDPw X-Received: by 2002:a05:6a00:d8b:b0:681:9fe0:b543 with SMTP id bf11-20020a056a000d8b00b006819fe0b543mr2755406pfb.2.1688033044398; Thu, 29 Jun 2023 03:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688033044; cv=none; d=google.com; s=arc-20160816; b=XMfuHplSXmGRJSzNrxp/IFNoU9kRNg957svr8fohfv7jttRoG0tpiBYQqQJebPceHD UOJnmDaeLc+I0ciuee7sfKR7Hovb2rRRbw7eQCP7FSNjKtwp5kqZ6oebxau1CWsuCze4 PqoHfVXAAv7+oxiRzSPdv5rYfeSYXptLY45vr8b+QttVS0XfGMmAICTvrmafJb5B36/d JjlWBBQmyW/heyo4dBC3wgHghnPICsxll5OcxTsOtxlgGPdgIIXEdbO9AcLQPhWzio9v lMyKJRNcR/ktyrydDFJ2Wqh9u72jA3Q7OxSETQxmK2OxcLa6pBlkbcwp8cogukt2EZ1X tH6A== 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=pHQQhtxRrNw/N73oeu5paGAIKq+Rs5mWhJfd822m5Yo=; fh=w4faXQm1q1Gh1kuBhZC0K/Cre03aBtXVbTnNr8BSNRA=; b=gQVxUlHDGNTVwKMHBSsqkzx4rIOyPAqKUazd5S6KUc1xX1l0YO5Jpiw9oCWghvsaYt IRMvCJo5PEAJdr+P/8bmRhInz4ITctfB2jrvuV5SNaefgxtaGnezW4w3lRPH9/gqNzaO 1lchdEPZfH0jCuBq9mgJrJty5rjXLtGxwwA90jcwhtnd4F+YRkOoZDwUSLcnVleJXxyd /mm6Tii56kTFVToeF1yxjbQQAVaN2G1PzuS/Cq7kbOmpnPgRDdoXbrp1BcZMzjEzaO4v T5zEyUoJVWHAZ1+cU29UA4kJfbl6J4PUD3PcMQyQlI6gkykIYSGpAHtY2DP3SWfiUPbI UImg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qpOuu0pI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t4-20020a63f344000000b0052c9fa00344si11014552pgj.625.2023.06.29.03.03.49; Thu, 29 Jun 2023 03:04:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qpOuu0pI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232399AbjF2J1l (ORCPT + 99 others); Thu, 29 Jun 2023 05:27:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232298AbjF2J1Y (ORCPT ); Thu, 29 Jun 2023 05:27:24 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4610D2703 for ; Thu, 29 Jun 2023 02:27:20 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4fb863edcb6so728277e87.0 for ; Thu, 29 Jun 2023 02:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688030838; x=1690622838; 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=pHQQhtxRrNw/N73oeu5paGAIKq+Rs5mWhJfd822m5Yo=; b=qpOuu0pIwJlg0hPzMAqRehNeBGOfRBcvYghlfHE5ijGolpAN/FsWbEOcdMgV2Dg31i mRhkkPtN10JWo/4tkv5h8MbIVvJA1iiRPgbHuU895dGMG4pZm8CeP5AAQ5AbSIqCf81z o2k02ixdoQ4DDJgdT/x0qHioMisFOny4q+hRCvLQGGlPQU0g6zpshBztiU9rkoG5vHk7 kJezHudplA5fT5g/QXvAtddm9F+tsTVnfQpVlfxWajzjc3nDaUmFRo2UPHbw+w5LlgZ6 NSHepZNpWu08ltPjncMLnpFoTN4bE6RyhxRTPHgFwoImfMEiBTQLM0DaQQ5tc+r/VOdr 2evA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688030838; x=1690622838; 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=pHQQhtxRrNw/N73oeu5paGAIKq+Rs5mWhJfd822m5Yo=; b=CAUtQrPzxSJDXPGhvEl3FK93KFhWVa7tPAxpBG7Kejji9m1MU5E1f9v2Z+AhPsGyNi qrGYXzC1XCHjwt7QAFb6aYZj4Wf5eWcCiH/QIGtbleRLii8eSM9ICoQOB46mR4WI3ZdQ LlcPpn5UCh0jM5MmWi6nN9iIsmM6fn9yge0iSJR0Ehw57p9gvB4pcXLwXL3q5Wubs4A9 48Fqlhop9U4QQi6UuPlmuCpKfL/t4d3xdmQXDNLWS8HQlm53roc4AEwMNAHnKMJLTcdn 20y+8V9258pXy9DwJKC8t99451wZXgLEUKAiLcHAuGc/Inj25eKWlXmqp+Ps7hxRBdz3 u78g== X-Gm-Message-State: AC+VfDyzzVJOrdAA9voXqDUiTgb92jmzffln3eeX9TCEhnm/r76ljJ9l /v9Njj0tgvBHy5PVpXi+0qIiUg== X-Received: by 2002:a05:6512:39cb:b0:4fb:9631:4bb with SMTP id k11-20020a05651239cb00b004fb963104bbmr2618068lfu.11.1688030838557; Thu, 29 Jun 2023 02:27:18 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id s4-20020adfea84000000b002ca864b807csm15800172wrm.0.2023.06.29.02.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 02:27:17 -0700 (PDT) From: Neil Armstrong Date: Thu, 29 Jun 2023 11:27:12 +0200 Subject: [PATCH v4 3/4] input: touchscreen: add I2C support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20230606-topic-goodix-berlin-upstream-initial-v4-3-0947c489be17@linaro.org> References: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> In-Reply-To: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy 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=4476; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=2lAFdePYf/Rc2YPrDd8SFDwhphuN7s7QrVU8qBwj8ls=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBknU5xA1C3NCQUd3elc93N00ZSN+49tGful3xUfdIp BwsxhLKJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJ1OcQAKCRB33NvayMhJ0XqbD/ wNPDRrasmAOurEG5ZU9ORB3WyfxCkEkgeLzeZKMIJXEV80koCBPNv/ucRX98/WZPmxZE1qOl8eLbTT fey2AE+tHImA5HIccAQ+VTN/+kNbVLRrYeMaZqfYLZuRleg/1ds6kVy3/DfEVHIjg2Wts3MlM0uyLd shj6CC0Yz475fRyVBFQ4ViVguK4EUhghazwKr92mipyuhx/VKs0prPwBiPO8hbrK4Uk4DfOd8psbAU hAOF+T7PU1uAy4gyB/PoAU/gIDh/NEY5GmqpH1ze+rkNKbcFceDkayapGyOtqndhTflIObHtus3iBt GzOImt6EWnHIoyH+6vTlpS1jU4dmZy4mQdJRzfaHzqsbIfYHQQR428K8lTX3+n2qyaEBOng93kjCQI 2cOo5Z2okBbNoCpls5DrEFz/MqqR/+yWA1wLnWZ848da4VVKaOtJR97/iCN40qRij7FF6yXTyYfIEh rXtXg+bGt9h0mQyMZhAWc62dgFIynIf6YVS3VsOyIJbOKAXIhFrSwy9a3G6+ORV9NZUWegJsi8ENj6 Nyb6Z5nx72fs8FDq5aINpYgML3XzbrBxph3Omo/2dDnTaV+3UygPFwiM4Y3tcMuPVD7BjS4pZbl8dH sMPxtzy3NSa/NfUNg5gPYnV1wMXNc91+bkdN4DxmFxk7fgjPCT3HCrh43Wbw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770030937450456835?= X-GMAIL-MSGID: =?utf-8?q?1770030937450456835?= 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 f6ed3f334447..d35169cbb499 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 29cdb042e104..921a2da0c2be 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 Thu Jun 29 09:27:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 114261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9515225vqr; Thu, 29 Jun 2023 02:50:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4oX75JzLywyqkDRdQ6GTS/A+xZV1MzBZE0dDQl+dwyE8qMSGQZRtS4Vzd2EOJ5ZhD9JcfY X-Received: by 2002:a17:902:f691:b0:1af:adc2:ab5b with SMTP id l17-20020a170902f69100b001afadc2ab5bmr45072123plg.0.1688032255649; Thu, 29 Jun 2023 02:50:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688032255; cv=none; d=google.com; s=arc-20160816; b=O3wPimOBrUWR6tMxkCX6MET8aII2f8LYX4WPhleaV6YAlPwMciHcFBJ6+irL3cwtsK aw3Sxyr/7cWi+4//rL22PXuH6OibhegKlCVfUKkQ/+3bBbJH3rwz/sb8STD+jn8vsVNn A/onyPfYgfQCN0fkOvzblp1IjvYVfhbw2lXB7uDzteOJF9DDWBMmVY6IwUC074vRiCPd 9GzOSNICAxetDAPF0X9yX8wwcL0bJbp2ITCtUJHEc6lCzpfQ8LkQ4lbqKTiUpNrMo/3S N+JmzRyGQzOms07hKG1g9Bw2TDTTMW5FxBTxJhKMbBXhg7EGcA0/4Fs0ffaBC6fD7Gnt 5MyQ== 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=HZGBLi25nD/aYuOw3g39i4aiVU+4nS8bcITX87gTnA8=; fh=w4faXQm1q1Gh1kuBhZC0K/Cre03aBtXVbTnNr8BSNRA=; b=Beogb99VUb85MMbRMUpwu1J8oY5+sths32rv0zN7y8nWiYe1LoPqSGpZLQgdYlMgaU xaHTA8Ig7lCQA1JFU1NjiJqrWL5Np2/cY/d5TLMQ7QuQqO+vrMy9204VK167X23gDjL0 TVFE4dIhxZl+UBWflpoePaB+4n3HCJSFzSE9Nja9wRe9dnXPFklon6Y3dIzBUd6gb2bN LlFdbzFS7xa9v+VxHWjzZJ3PPZ0MgqoqXpqWHNZLyds+0PnwgQd2dqu9GltC/IqBSI32 +nPdDCYtX2SQCpLP2nYuScTxWmPWw8OpAi7Ia7ZWduac6neWUeKknzyJoSWmbUl2gXUH WFzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JwvFdt5Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jb11-20020a170903258b00b001b7e8d4e414si9026427plb.486.2023.06.29.02.50.40; Thu, 29 Jun 2023 02:50:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JwvFdt5Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232558AbjF2J1r (ORCPT + 99 others); Thu, 29 Jun 2023 05:27:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232466AbjF2J1Z (ORCPT ); Thu, 29 Jun 2023 05:27:25 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4560DE57 for ; Thu, 29 Jun 2023 02:27:21 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-314118623d5so518764f8f.0 for ; Thu, 29 Jun 2023 02:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688030839; x=1690622839; 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=HZGBLi25nD/aYuOw3g39i4aiVU+4nS8bcITX87gTnA8=; b=JwvFdt5YNfwsmdSMMK3A3ounP/F695t9fcdN7Emj3CM+JxBsubSFoWpfasmMC2d9vX BQxznwtr+rqbp6nWuEBR9yNgi234oBoWJKOs5MDGpnbd6X421zK86p8KYyiLXddfC0Zw +r42yDJIU3fbtKx4aYoOmKa0de00bwKkX2BX6b32j/NIYDB+ReJdXdWuIbftofFMyb0q f5P72967wWrbECvfVBJ22R9Jp47KJ8+pUUQMNTLu2eRx09LlVmvNxp4lAFL7GaOF+Jsc k8P5nJq2WZ8AJ/QHfjbYmrKI++2y7vUV+bm0jQM8RuhfePiyxem9X67XvbVcFQHpDRgX vn6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688030840; x=1690622840; 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=HZGBLi25nD/aYuOw3g39i4aiVU+4nS8bcITX87gTnA8=; b=eFSNrB86+oZVH9CQ3UbMSf3+x/Hrml07niG3I/dOvJc88BIb0T52wwFsfTw68Jo9M4 bKzQmATON3gCh1V4kylWcwXRzD9l6QcpJT/d5FiWU3frcnZlXvCMPzAVmS2qjxIHvLU7 NqLWa7YLFPF90lQqlNGGW74gZeRnDUIEsiz5t5Pfqvs47wIeJaJpaTx2wDuJ9/fJs8MK FAiLF4Q4C86xwyCruuth0ZW1W0kKLT4l4EljLNXv1KDdnesw+7A+nZTdzuCbazd7ubGt KDZyrVwVfmuWYSosAlfXJFeki8VYq4yffzPEbKqJgVzvsBVCgfi2hvLXCtSOHPME5J2G uT8w== X-Gm-Message-State: AC+VfDyzQayZPHv2VqYQEq0Rv6Xt4kcBFA6tovyOlwqLKvup6F1Sv5n0 OOEuAvh3HmUzUSc48mlmI+8tjw== X-Received: by 2002:adf:ed45:0:b0:314:f18:bc65 with SMTP id u5-20020adfed45000000b003140f18bc65mr3404730wro.66.1688030839587; Thu, 29 Jun 2023 02:27:19 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id s4-20020adfea84000000b002ca864b807csm15800172wrm.0.2023.06.29.02.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 02:27:19 -0700 (PDT) From: Neil Armstrong Date: Thu, 29 Jun 2023 11:27:13 +0200 Subject: [PATCH v4 4/4] input: touchscreen: add SPI support for Goodix Berlin Touchscreen IC MIME-Version: 1.0 Message-Id: <20230606-topic-goodix-berlin-upstream-initial-v4-4-0947c489be17@linaro.org> References: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> In-Reply-To: <20230606-topic-goodix-berlin-upstream-initial-v4-0-0947c489be17@linaro.org> To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastien Nocera , Hans de Goede , Henrik Rydberg , Jeff LaBundy 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=8018; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=6p0qngI+/AjpbuUEco8P0GD1zTWs+gFMrO17zX2V82Q=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBknU5x/8zktV99fc+Q7u4NhVsZoYCiIckYKTLEBy3k 9V8+tQiJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJ1OcQAKCRB33NvayMhJ0aJ1D/ 9td8jJScav9Iuj/5n3XSoGlWcu+AwYn0kMBvotekXJqTvq6L2XoRC/PTkdOyuVfsDwkK/pM1GjaIZk X5OpXwSIuI5tcYie/3cIASHYHjfF/sCTcSQKn3WqnbVv7+2s78/gCpVq/uItjK0HZ+abN4mNm0cN8+ QBahtJxjK3jTPwJVgSaZsMpa3aAetZVKBoSzHazaYgPdNKQAD/kFDfZ61Vi3Xx2tYEbHR/YMnymVa6 OSRhj0uHmaS5zuTAKK9U6rzDfqMtNGSdmZkEa4d0/0rHeGyhQhak57BLMTrBRy4rAfnuIMtfdbf52K mFhoNAN+E1ayBai0rHk/vz0M3EdzfiMO9KtlP/BNoBCilFdUjtpsGrY5gIpwF0uNDUCJWYs4aCp1bb QRUL5jS7SdwwSi2jm5YyEwKkZwC161H+tYeSAeQ3UyzWHq9T+aPcU9vXWCwzNq7tf2QamIhmyFBtu2 8a902rmdbDKpSF465c1apyeGzcghBFHL3AN64mhpVpgkoXDDNyALcLDS17r0jqj2ErdUZPpjW7IxUh GaP4znv4zDb++w2PmN/cNzxQyItHmz/H1s835XMJNEHWZJUaBrkpTs2EkOqNA5eRvOzeztatlU3lbc cfRZmmjnil3FXu5V7jSXj3/DC3dngd2+eTG161BeJvhM35UkKJGAELhXxQDg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770030110531373337?= X-GMAIL-MSGID: =?utf-8?q?1770030110531373337?= 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 d35169cbb499..4f017555bd5b 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 921a2da0c2be..29524e8a83db 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 ");