From patchwork Fri Jun 9 06:36:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cong yang X-Patchwork-Id: 13273282 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 A14DDC7EE2F for ; Fri, 9 Jun 2023 06:36:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238095AbjFIGgk (ORCPT ); Fri, 9 Jun 2023 02:36:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230131AbjFIGgg (ORCPT ); Fri, 9 Jun 2023 02:36:36 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4886930F4 for ; Thu, 8 Jun 2023 23:36:34 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1b04706c974so4880515ad.2 for ; Thu, 08 Jun 2023 23:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20221208.gappssmtp.com; s=20221208; t=1686292593; x=1688884593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ORhDRjsPJgq36LWDEz4NyoRdPPVr5GxVUW38IXtaYD4=; b=0LBDVZOWpX75RD7WNATAWCE0fA3NqmWXpfkgMjzlsmHtFdrlJOpSiTBcj607akNqlG OnNOZeFA9hwsB1AqMgB3gwwCJsyzdKiEb/CJVDp51D8SdtCdTpQsGU+n0xC1uyDyx2hK e/r+jorWGBGAobj5QjvtQ1VRYkROJ+qN4kRsX5tx0zez4nPrz0jeYq/j0tpYp+JW2bKN 0HR4GWguoU5QUVvsI7ErlrB0E58BBhKwFyNJkl+blU3DyTIZc0447P3Ncg3h1GteR/dZ Nr0u9geYncnF4G2dSQbHezlESdElpi04Y1yS4ma3h7po8dek4e/lKGPvLSifQdLbRguB /Z9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686292593; x=1688884593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ORhDRjsPJgq36LWDEz4NyoRdPPVr5GxVUW38IXtaYD4=; b=jVUOjgp62fO0I3FrTHY2futlIi4atzNfw9zEhTkjiJ9fLDg5M7NqhNUEgsDZAjMhCL 22mhp3EIZ0NdfZsKDhwtDTrEkz8D8mA84ZyVdhNUIwhFtKlz4Nn1bFDbYLInGjKVvVGZ fxwQRYVBTJj2+jxheMTSiV0USiVAl4nIq/aDvkdgId1ZliLTwCd/fVLjoOEHgvErqBpB mqrXygtE6K/R8yA8CXdEz2hBPsMIP9XOD3TDNO1zdUPZkrGRZH/8uY6MiUk5rdcoBqSg 0i00sbga9GW36pXHSEQGfYtC01gc0DVIt6yvGdCwn3oAgazMSb/c5Q1j5isYa99H1Hm5 F51Q== X-Gm-Message-State: AC+VfDzND5bhulf7Ys3FvcykV2h/F+Cs5L84Cpy7nZxBn3BWaTGAacQG fXUWXG/SyR1n+JFAnskVfXbL/Q== X-Google-Smtp-Source: ACHHUZ4gpx6DzCVgZ9AgZ5eFGHFefmt/uQnouUPu0M9P+ifeZKL7S44CrfjvFtx41svv0m3X3l0Nww== X-Received: by 2002:a17:902:f54f:b0:1ac:b449:3528 with SMTP id h15-20020a170902f54f00b001acb4493528mr579434plf.46.1686292593703; Thu, 08 Jun 2023 23:36:33 -0700 (PDT) Received: from yc.huaqin.com ([101.78.151.214]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b211283294sm2445709plg.163.2023.06.08.23.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 23:36:33 -0700 (PDT) From: Cong Yang To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, dmitry.torokhov@gmail.com, jikos@kernel.org, benjamin.tissoires@redhat.com, dianders@chromium.org, hsinyi@google.com Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Cong Yang Subject: [PATCH v5 1/2] dt-bindings: HID: i2c-hid: ilitek: Introduce bindings for Ilitek ili9882t Date: Fri, 9 Jun 2023 14:36:14 +0800 Message-Id: <20230609063615.758676-2-yangcong5@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230609063615.758676-1-yangcong5@huaqin.corp-partner.google.com> References: <20230609063615.758676-1-yangcong5@huaqin.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The ili9882t touch screen chip same as Elan eKTH6915 controller has a reset gpio. The difference is that ili9882t needs to use vccio-supply instead of vcc33-supply. Doug's series[1] allows panels and touchscreens to power on/off together, let's add a phandle for this. [1]: https://lore.kernel.org/r/20230607215224.2067679-1-dianders@chromium.org Signed-off-by: Cong Yang Reviewed-by: Krzysztof Kozlowski --- .../bindings/input/ilitek,ili9882t.yaml | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/ilitek,ili9882t.yaml diff --git a/Documentation/devicetree/bindings/input/ilitek,ili9882t.yaml b/Documentation/devicetree/bindings/input/ilitek,ili9882t.yaml new file mode 100644 index 000000000000..c5d9e0e919f9 --- /dev/null +++ b/Documentation/devicetree/bindings/input/ilitek,ili9882t.yaml @@ -0,0 +1,67 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/ilitek,ili9882t.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Ilitek ili9882t touchscreen controller + +maintainers: + - Cong Yang + +description: + Supports the Ilitek ili9882t touchscreen controller. + This touchscreen controller uses the i2c-hid protocol with a reset GPIO. + +allOf: + - $ref: /schemas/input/touchscreen/touchscreen.yaml# + +properties: + compatible: + const: ilitek,ili9882t + + reg: + const: 0x41 + + interrupts: + maxItems: 1 + + panel: true + + reset-gpios: + maxItems: 1 + description: Reset GPIO. + + vccio-supply: + description: The 1.8V supply to the touchscreen. + +required: + - compatible + - reg + - interrupts + - panel + - vccio-supply + +additionalProperties: false + +examples: + - | + #include + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + touchscreen: touchscreen@41 { + compatible = "ilitek,ili9882t"; + reg = <0x41>; + + interrupt-parent = <&pio>; + interrupts = <12 IRQ_TYPE_LEVEL_LOW>; + + panel = <&panel>; + reset-gpios = <&pio 60 GPIO_ACTIVE_LOW>; + vccio-supply = <&mt6366_vio18_reg>; + }; + }; From patchwork Fri Jun 9 06:36:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cong yang X-Patchwork-Id: 13273283 X-Patchwork-Delegate: jikos@jikos.cz 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 6ED6FC7EE25 for ; Fri, 9 Jun 2023 06:36:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236066AbjFIGgu (ORCPT ); Fri, 9 Jun 2023 02:36:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238155AbjFIGgs (ORCPT ); Fri, 9 Jun 2023 02:36:48 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A2052D63 for ; Thu, 8 Jun 2023 23:36:42 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-256e1d87a46so335266a91.0 for ; Thu, 08 Jun 2023 23:36:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20221208.gappssmtp.com; s=20221208; t=1686292601; x=1688884601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VOfDaLrOZlpldUp3/P9HpXZktMDt/X5VfdiAMTIut08=; b=S8m7ykoqarbGu1wy8n2x38S8/Y5WEDUzdObdhCnwOVaJZ/iHzyowv7BojphhxUrw0Z eOgXo2A4DhKhspDerq8GXAsWAlf94ajXm4NUzGV9AP5jb0TULc9lgR0O50xvmXWPSmn0 zKbsqe89Ojiy4KopKLLA/odV+BfJ/Ct6+aCYCFNg1+PRZDBK2JtINwhpHr47cGqyIaDZ ggHE500Y3mUCxEpJAqMJvW3bU5Edt7A5JavHaocgT77CLVHjIhuPyZ1zcxQtKOzh1R84 OSNP6+0Jo3rDk9SIMR2UlU2qtL/yzw/YCHwhECN82ROriqfQsGG9h8tYRkJo0jeNd3Em RBMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686292601; x=1688884601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VOfDaLrOZlpldUp3/P9HpXZktMDt/X5VfdiAMTIut08=; b=OET6jiAJMWYKa3x/H4FKD1VwTXqSISmkdZaSCHQxrANwlqJiMZOsz+KLnUNEu1Vzp3 VgUbFbiilnFo8rei7gbEib6BBi5pU8qna6kEy7PolKsUKsi20ofJspCAAweIsQxnjxph WXA2ixBcdDXuBawg5ucjUvmc3KUMIoR6VtIGM0ezHPlMEKpFZ1dnouzuY4A07pYPwK1Z Nlv1yWHIuwxgTkd1FJ72OHdNspKeetKadSst5j8PUiLeaFuHEZfq06hrcr7iPpO8e8JN 9C1myx28zLBFWZvtpd/NO76jovIgqMA/59vMY4HPDwgYeIk1RxoVvm2G0oNK9o9mzRGu B/Kw== X-Gm-Message-State: AC+VfDxa9MkB4LC6wVeCccsDiBGCkb7vGMwCn/TDhN33lDIrwMAEEw6Q jQbEmjyr+TiH2VWggvb94jKGog== X-Google-Smtp-Source: ACHHUZ6EkrmaOYmKhshdJT0Kx5qOo4WPN2JO2PMeex/u+c9aZg3SQqKBnckbl0TsSoXwY5g2Q/rWCQ== X-Received: by 2002:a17:90a:8988:b0:259:bf40:b581 with SMTP id v8-20020a17090a898800b00259bf40b581mr305362pjn.37.1686292601674; Thu, 08 Jun 2023 23:36:41 -0700 (PDT) Received: from yc.huaqin.com ([101.78.151.214]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b211283294sm2445709plg.163.2023.06.08.23.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 23:36:41 -0700 (PDT) From: Cong Yang To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, dmitry.torokhov@gmail.com, jikos@kernel.org, benjamin.tissoires@redhat.com, dianders@chromium.org, hsinyi@google.com Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Cong Yang Subject: [PATCH v5 2/2] HID: i2c-hid: elan: Add ili9882t timing Date: Fri, 9 Jun 2023 14:36:15 +0800 Message-Id: <20230609063615.758676-3-yangcong5@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230609063615.758676-1-yangcong5@huaqin.corp-partner.google.com> References: <20230609063615.758676-1-yangcong5@huaqin.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The ili9882t is a TDDI IC (Touch with Display Driver). The datasheet specifies there should be 60ms between touch SDA sleep and panel RESX. Doug's series[1] allows panels and touchscreens to power on/off together, so we can add the 65 ms delay in i2c_hid_core_suspend before panel_unprepare. Because ili9882t touchscrgeen is a panel follower, and needs to use vccio-supply instead of vcc33-supply, so set it NULL to ili9882t_chip_data, then not use vcc33 regulator. [1]: https://lore.kernel.org/r/20230607215224.2067679-1-dianders@chromium.org Signed-off-by: Cong Yang Reviewed-by: Douglas Anderson --- drivers/hid/i2c-hid/i2c-hid-of-elan.c | 50 ++++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c index 76ddc8be1cbb..5e52027ab60a 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c +++ b/drivers/hid/i2c-hid/i2c-hid-of-elan.c @@ -18,9 +18,11 @@ #include "i2c-hid.h" struct elan_i2c_hid_chip_data { - unsigned int post_gpio_reset_delay_ms; + unsigned int post_gpio_reset_on_delay_ms; + unsigned int post_gpio_reset_off_delay_ms; unsigned int post_power_delay_ms; u16 hid_descriptor_address; + const char *main_supply_name; }; struct i2c_hid_of_elan { @@ -38,9 +40,11 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops) container_of(ops, struct i2c_hid_of_elan, ops); int ret; - ret = regulator_enable(ihid_elan->vcc33); - if (ret) - return ret; + if (ihid_elan->vcc33) { + ret = regulator_enable(ihid_elan->vcc33); + if (ret) + return ret; + } ret = regulator_enable(ihid_elan->vccio); if (ret) { @@ -52,8 +56,8 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops) msleep(ihid_elan->chip_data->post_power_delay_ms); gpiod_set_value_cansleep(ihid_elan->reset_gpio, 0); - if (ihid_elan->chip_data->post_gpio_reset_delay_ms) - msleep(ihid_elan->chip_data->post_gpio_reset_delay_ms); + if (ihid_elan->chip_data->post_gpio_reset_on_delay_ms) + msleep(ihid_elan->chip_data->post_gpio_reset_on_delay_ms); return 0; } @@ -64,8 +68,12 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops) container_of(ops, struct i2c_hid_of_elan, ops); gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1); + if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms) + msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms); + regulator_disable(ihid_elan->vccio); - regulator_disable(ihid_elan->vcc33); + if (ihid_elan->vcc33) + regulator_disable(ihid_elan->vcc33); } static int i2c_hid_of_elan_probe(struct i2c_client *client) @@ -89,24 +97,42 @@ static int i2c_hid_of_elan_probe(struct i2c_client *client) if (IS_ERR(ihid_elan->vccio)) return PTR_ERR(ihid_elan->vccio); - ihid_elan->vcc33 = devm_regulator_get(&client->dev, "vcc33"); - if (IS_ERR(ihid_elan->vcc33)) - return PTR_ERR(ihid_elan->vcc33); - ihid_elan->chip_data = device_get_match_data(&client->dev); + if (ihid_elan->chip_data->main_supply_name) { + ihid_elan->vcc33 = devm_regulator_get(&client->dev, + ihid_elan->chip_data->main_supply_name); + if (IS_ERR(ihid_elan->vcc33)) + return PTR_ERR(ihid_elan->vcc33); + } + return i2c_hid_core_probe(client, &ihid_elan->ops, ihid_elan->chip_data->hid_descriptor_address, 0); } static const struct elan_i2c_hid_chip_data elan_ekth6915_chip_data = { .post_power_delay_ms = 1, - .post_gpio_reset_delay_ms = 300, + .post_gpio_reset_on_delay_ms = 300, + .hid_descriptor_address = 0x0001, + .main_supply_name = "vcc33", +}; + +static const struct elan_i2c_hid_chip_data ilitek_ili9882t_chip_data = { + .post_power_delay_ms = 1, + .post_gpio_reset_on_delay_ms = 200, + .post_gpio_reset_off_delay_ms = 65, .hid_descriptor_address = 0x0001, + /* + * this touchscreen is tightly integrated with the panel and assumes + * that the relevant power rails (other than the IO rail) have already + * been turned on by the panel driver because we're a panel follower. + */ + .main_supply_name = NULL, }; static const struct of_device_id elan_i2c_hid_of_match[] = { { .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data }, + { .compatible = "ilitek,ili9882t", .data = &ilitek_ili9882t_chip_data }, { } }; MODULE_DEVICE_TABLE(of, elan_i2c_hid_of_match);