From patchwork Sun Apr 9 14:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 672196 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 81171C77B70 for ; Sun, 9 Apr 2023 14:43:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229583AbjDIOnZ (ORCPT ); Sun, 9 Apr 2023 10:43:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjDIOnZ (ORCPT ); Sun, 9 Apr 2023 10:43:25 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B05AC30E9 for ; Sun, 9 Apr 2023 07:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681051369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UFLbyQ/siPdTt/ksUTe6CUAuQDKxUj93BikknIIghx8=; b=d5f+RlX7BoA9H/30rH8gx6Rmoe26iIpo/M4W64YXzk66QZgJDbjkOEo4Xo8G3hN+jtCafl fet6nSL/j5lgqWt6MzhrA9T/Y0irDFSORLnwSZaraUaBf6pqK5WJnjwgGj+BDKDd0mb8sR 9tZ+suAhTcDfVEeEGgeJxGNjF/yuLL8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-kt3gUJQnMTuyZHAQceqruA-1; Sun, 09 Apr 2023 10:42:46 -0400 X-MC-Unique: kt3gUJQnMTuyZHAQceqruA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A125101A531; Sun, 9 Apr 2023 14:42:46 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DBD52027040; Sun, 9 Apr 2023 14:42:45 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Douglas Anderson Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH 1/6] HID: i2c-hid-of: Consistenly use dev local variable in probe() Date: Sun, 9 Apr 2023 16:42:38 +0200 Message-Id: <20230409144243.25360-2-hdegoede@redhat.com> In-Reply-To: <20230409144243.25360-1-hdegoede@redhat.com> References: <20230409144243.25360-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org i2c_hid_of_probe() has a dev local variable pointing to &i2c_client->dev, consistently use this everywhere in i2c_hid_of_probe(). Signed-off-by: Hans de Goede --- drivers/hid/i2c-hid/i2c-hid-of.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index 10176568133a..c82a5a54c3e6 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -75,7 +75,7 @@ static int i2c_hid_of_probe(struct i2c_client *client) int ret; u32 val; - ihid_of = devm_kzalloc(&client->dev, sizeof(*ihid_of), GFP_KERNEL); + ihid_of = devm_kzalloc(dev, sizeof(*ihid_of), GFP_KERNEL); if (!ihid_of) return -ENOMEM; @@ -84,24 +84,21 @@ static int i2c_hid_of_probe(struct i2c_client *client) ret = of_property_read_u32(dev->of_node, "hid-descr-addr", &val); if (ret) { - dev_err(&client->dev, "HID register address not provided\n"); + dev_err(dev, "HID register address not provided\n"); return -ENODEV; } if (val >> 16) { - dev_err(&client->dev, "Bad HID register address: 0x%08x\n", - val); + dev_err(dev, "Bad HID register address: 0x%08x\n", val); return -EINVAL; } hid_descriptor_address = val; - if (!device_property_read_u32(&client->dev, "post-power-on-delay-ms", - &val)) + if (!device_property_read_u32(dev, "post-power-on-delay-ms", &val)) ihid_of->post_power_delay_ms = val; ihid_of->supplies[0].supply = "vdd"; ihid_of->supplies[1].supply = "vddl"; - ret = devm_regulator_bulk_get(&client->dev, - ARRAY_SIZE(ihid_of->supplies), + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ihid_of->supplies), ihid_of->supplies); if (ret) return ret; From patchwork Sun Apr 9 14:42:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 672195 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 32DE9C77B71 for ; Sun, 9 Apr 2023 14:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbjDIOnf (ORCPT ); Sun, 9 Apr 2023 10:43:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjDIOnd (ORCPT ); Sun, 9 Apr 2023 10:43:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2CD2358C for ; Sun, 9 Apr 2023 07:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681051373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZqvPZJAfawDAQ9NHo9T3b1Jmr1jDjUSR0TnjxNywKX0=; b=LxkD57IEkBjncRYgCfADpOlz/A7R7NusVhpgcE8AM6x0mQErSej/tqEWdv9RIVtJer1GmW HwwovV22AvHXm9+Cs+wZTmH4/BdXqLITwrSen8X/BzuNkDLP9iy/qyos/+tehf4Vn4jH1X nGr/S2d4LSFC9as6zmR6nu4O5fOQj/A= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-139-vgQW4zZCPTq2dGOnBkPwKA-1; Sun, 09 Apr 2023 10:42:47 -0400 X-MC-Unique: vgQW4zZCPTq2dGOnBkPwKA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49D0B3C0C899; Sun, 9 Apr 2023 14:42:47 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CFB4202701E; Sun, 9 Apr 2023 14:42:46 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Douglas Anderson Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH 2/6] HID: i2c-hid-of: Allow using i2c-hid-of on non OF platforms Date: Sun, 9 Apr 2023 16:42:39 +0200 Message-Id: <20230409144243.25360-3-hdegoede@redhat.com> In-Reply-To: <20230409144243.25360-1-hdegoede@redhat.com> References: <20230409144243.25360-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org There are some x86 tablets / 2-in-1s which ship with Android as their factory OS image. These have pretty broken ACPI tables, relying on everything being hardcoded in the factory kernel image. platform/x86/x86-android-tablets.c manually instantiates i2c-clients for i2c devices on these tablets to make them work with the mainline kernel. The Lenovo Yoga Book 1 (yb1-x90f/l) is such a 2-in-1. It has 2 I2C-HID devices its main touchscreen and a Wacom digitizer. Its main touchscreen can alternatively also be used in HiDeep's native protocol mode but for the Wacom digitizer we really need I2C-HID. This patch allows using i2c-hid-of on non OF platforms so that it can bind to a non ACPI instantiated i2c_client on x86 for the Wacom digitizer. Note the driver already has an "i2c-over-hid" i2c_device_id (rather then an of_device_id). Besides enabling building on non-OF platforms this also replaces the only of_property_read_u32() call with device_property_read_u32() note that other properties where already read using device_property_read_...(). Signed-off-by: Hans de Goede --- drivers/hid/i2c-hid/Kconfig | 6 ++++-- drivers/hid/i2c-hid/i2c-hid-of.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig index 4439be7fa74d..3be17109301a 100644 --- a/drivers/hid/i2c-hid/Kconfig +++ b/drivers/hid/i2c-hid/Kconfig @@ -23,12 +23,14 @@ config I2C_HID_ACPI config I2C_HID_OF tristate "HID over I2C transport layer Open Firmware driver" - depends on OF + # No "depends on OF" because this can also be used for manually + # (board-file) instantiated "hid-over-i2c" type i2c-clients. select I2C_HID_CORE help Say Y here if you use a keyboard, a touchpad, a touchscreen, or any other HID based devices which is connected to your computer via I2C. - This driver supports Open Firmware (Device Tree)-based systems. + This driver supports Open Firmware (Device Tree)-based systems as + well as binding to manually (board-file) instantiated i2c-hid-clients. If unsure, say N. diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index c82a5a54c3e6..385f7460e03c 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -82,7 +82,7 @@ static int i2c_hid_of_probe(struct i2c_client *client) ihid_of->ops.power_up = i2c_hid_of_power_up; ihid_of->ops.power_down = i2c_hid_of_power_down; - ret = of_property_read_u32(dev->of_node, "hid-descr-addr", &val); + ret = device_property_read_u32(dev, "hid-descr-addr", &val); if (ret) { dev_err(dev, "HID register address not provided\n"); return -ENODEV; @@ -113,11 +113,13 @@ static int i2c_hid_of_probe(struct i2c_client *client) hid_descriptor_address, quirks); } +#ifdef CONFIG_OF static const struct of_device_id i2c_hid_of_match[] = { { .compatible = "hid-over-i2c" }, {}, }; MODULE_DEVICE_TABLE(of, i2c_hid_of_match); +#endif static const struct i2c_device_id i2c_hid_of_id_table[] = { { "hid", 0 }, From patchwork Sun Apr 9 14:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 671971 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 9F5A8C77B61 for ; Sun, 9 Apr 2023 14:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229586AbjDIOnk (ORCPT ); Sun, 9 Apr 2023 10:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229584AbjDIOnk (ORCPT ); Sun, 9 Apr 2023 10:43:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0141630F6 for ; Sun, 9 Apr 2023 07:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681051370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W25vjDxRWh3r7g/c9uA6SC3LXuaMuOvAMoNp73wzVP0=; b=Ggai89XQWaG60DYJ43FOxkAlvpybonRL4Jilg/ggYr/qq2roYB0jqZ7ledxgPV9y9VFA8r vHdEjjo0DgYCa/qv39oznsXA7RRERqg289tuDD6uGNWxMIrONbgvHwSpp579FLULvQ2SHY z7Ptbx7Ub0rFJH4XtVdAo2xm1mbdikg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-201-ojCNDTZQNM69OXMk95TO6g-1; Sun, 09 Apr 2023 10:42:48 -0400 X-MC-Unique: ojCNDTZQNM69OXMk95TO6g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A2DC185A78F; Sun, 9 Apr 2023 14:42:48 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C751202701E; Sun, 9 Apr 2023 14:42:47 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Douglas Anderson Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH 3/6] HID: i2c-hid-of: Add reset GPIO support to i2c-hid-of Date: Sun, 9 Apr 2023 16:42:40 +0200 Message-Id: <20230409144243.25360-4-hdegoede@redhat.com> In-Reply-To: <20230409144243.25360-1-hdegoede@redhat.com> References: <20230409144243.25360-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Add reset GPIO support to the generic i2c-hid-of driver This is necessary to make the Wacom digitizer on the Lenovo Yoga Book 1 (yb1-x90f/l) work and this will also allow consolidating the 2 specialized i2c-hid-of-elan.c and i2c-hid-of-goodix.c drivers into the generic i2c-hid-of driver. For now the new "post-reset-deassert-delay-ms" property is only used on x86/ACPI (non devicetree) devs. IOW it is not used in actual devicetree files and the same goes for the reset GPIO. The devicetree-bindings maintainers have requested properties like these to not be added to the devicetree-bindings, so the new property + GPIO are deliberately not added to the existing devicetree-bindings. Signed-off-by: Hans de Goede --- drivers/hid/i2c-hid/i2c-hid-of.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index 385f7460e03c..d0289afa57dc 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -35,8 +36,10 @@ struct i2c_hid_of { struct i2chid_ops ops; struct i2c_client *client; + struct gpio_desc *reset_gpio; struct regulator_bulk_data supplies[2]; int post_power_delay_ms; + int post_reset_delay_ms; }; static int i2c_hid_of_power_up(struct i2chid_ops *ops) @@ -55,6 +58,10 @@ static int i2c_hid_of_power_up(struct i2chid_ops *ops) if (ihid_of->post_power_delay_ms) msleep(ihid_of->post_power_delay_ms); + gpiod_set_value_cansleep(ihid_of->reset_gpio, 0); + if (ihid_of->post_reset_delay_ms) + msleep(ihid_of->post_reset_delay_ms); + return 0; } @@ -62,6 +69,7 @@ static void i2c_hid_of_power_down(struct i2chid_ops *ops) { struct i2c_hid_of *ihid_of = container_of(ops, struct i2c_hid_of, ops); + gpiod_set_value_cansleep(ihid_of->reset_gpio, 1); regulator_bulk_disable(ARRAY_SIZE(ihid_of->supplies), ihid_of->supplies); } @@ -96,6 +104,14 @@ static int i2c_hid_of_probe(struct i2c_client *client) if (!device_property_read_u32(dev, "post-power-on-delay-ms", &val)) ihid_of->post_power_delay_ms = val; + if (!device_property_read_u32(dev, "post-reset-deassert-delay-ms", &val)) + ihid_of->post_reset_delay_ms = val; + + /* Start out with reset asserted */ + ihid_of->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(ihid_of->reset_gpio)) + return PTR_ERR(ihid_of->reset_gpio); + ihid_of->supplies[0].supply = "vdd"; ihid_of->supplies[1].supply = "vddl"; ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ihid_of->supplies), From patchwork Sun Apr 9 14:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 672194 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 1CAC6C77B70 for ; Sun, 9 Apr 2023 14:43:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229584AbjDIOnl (ORCPT ); Sun, 9 Apr 2023 10:43:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjDIOnk (ORCPT ); Sun, 9 Apr 2023 10:43:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FA253AA1 for ; Sun, 9 Apr 2023 07:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681051373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E0HnaQz+neSY4UCoZ0HQeAfqhi9RPd92/yf48Aw/FlI=; b=hvLj0TnmNfQwwQACSbxksEJtfTzqIeCSU+CHTyBcB4cNNAEJE/9cOaYo+gjKyeipkmUBau Fjgl9NjFnP4D0ZLUKGnCwBSH32nKif6l0nm3LoR6c0CTQgM8NTELr8qQcBjwZKgwVrn9b9 N2CO8HN4SyY6/PNq/qeA5IZQpc4+gQw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-8zd_tPWAMV-i7cX8OH7Gjg-1; Sun, 09 Apr 2023 10:42:49 -0400 X-MC-Unique: 8zd_tPWAMV-i7cX8OH7Gjg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B7DB811E7C; Sun, 9 Apr 2023 14:42:49 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CCEB2027040; Sun, 9 Apr 2023 14:42:48 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Douglas Anderson Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH 4/6] HID: i2c-hid-of: Add chip_data struct Date: Sun, 9 Apr 2023 16:42:41 +0200 Message-Id: <20230409144243.25360-5-hdegoede@redhat.com> In-Reply-To: <20230409144243.25360-1-hdegoede@redhat.com> References: <20230409144243.25360-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Add a chip_data struct which can be used to set different supply-names and default power-on-delay, reset-deassert-delay and hid_descriptor_address values. This is a preparation patch for consolidating the 2 specialized i2c-hid-of-elan.c and i2c-hid-of-goodix.c drivers into the generic i2c-hid-of driver. Signed-off-by: Hans de Goede --- drivers/hid/i2c-hid/i2c-hid-of.c | 67 +++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index d0289afa57dc..4fafef1e36b9 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -32,24 +32,44 @@ #include "i2c-hid.h" +#define MAX_BULK_SUPPLIES 2 + +struct i2c_hid_of_chip_data { + const char * const *supply_names; + int num_supplies; + int post_power_delay_ms; + int post_reset_delay_ms; + u16 hid_descriptor_address; +}; + struct i2c_hid_of { struct i2chid_ops ops; struct i2c_client *client; struct gpio_desc *reset_gpio; - struct regulator_bulk_data supplies[2]; + struct regulator_bulk_data supplies[MAX_BULK_SUPPLIES]; + int num_supplies; int post_power_delay_ms; int post_reset_delay_ms; }; +static const char * const i2c_hid_of_default_supply_names[] = { + "vdd", + "vddl", +}; + +static const struct i2c_hid_of_chip_data i2c_hid_of_default_chip_data = { + .supply_names = i2c_hid_of_default_supply_names, + .num_supplies = ARRAY_SIZE(i2c_hid_of_default_supply_names), +}; + static int i2c_hid_of_power_up(struct i2chid_ops *ops) { struct i2c_hid_of *ihid_of = container_of(ops, struct i2c_hid_of, ops); struct device *dev = &ihid_of->client->dev; int ret; - ret = regulator_bulk_enable(ARRAY_SIZE(ihid_of->supplies), - ihid_of->supplies); + ret = regulator_bulk_enable(ihid_of->num_supplies, ihid_of->supplies); if (ret) { dev_warn(dev, "Failed to enable supplies: %d\n", ret); return ret; @@ -70,18 +90,28 @@ static void i2c_hid_of_power_down(struct i2chid_ops *ops) struct i2c_hid_of *ihid_of = container_of(ops, struct i2c_hid_of, ops); gpiod_set_value_cansleep(ihid_of->reset_gpio, 1); - regulator_bulk_disable(ARRAY_SIZE(ihid_of->supplies), - ihid_of->supplies); + regulator_bulk_disable(ihid_of->num_supplies, ihid_of->supplies); } static int i2c_hid_of_probe(struct i2c_client *client) { + const struct i2c_hid_of_chip_data *chip_data; struct device *dev = &client->dev; struct i2c_hid_of *ihid_of; u16 hid_descriptor_address; u32 quirks = 0; int ret; u32 val; + int i; + + chip_data = device_get_match_data(dev); + if (!chip_data) + chip_data = &i2c_hid_of_default_chip_data; + + if (chip_data->num_supplies > MAX_BULK_SUPPLIES) { + dev_err(dev, "Error chip_data->num_supplies > MAX_BULK_SUPPLIES (internal kernel error)\n"); + return -EINVAL; + } ihid_of = devm_kzalloc(dev, sizeof(*ihid_of), GFP_KERNEL); if (!ihid_of) @@ -90,16 +120,22 @@ static int i2c_hid_of_probe(struct i2c_client *client) ihid_of->ops.power_up = i2c_hid_of_power_up; ihid_of->ops.power_down = i2c_hid_of_power_down; + /* chip_data as defaults, allow device-properties to override things */ + ihid_of->post_power_delay_ms = chip_data->post_power_delay_ms; + ihid_of->post_reset_delay_ms = chip_data->post_reset_delay_ms; + hid_descriptor_address = chip_data->hid_descriptor_address; + ret = device_property_read_u32(dev, "hid-descr-addr", &val); - if (ret) { + if (ret == 0) { + if (val >> 16) { + dev_err(dev, "Bad HID register address: 0x%08x\n", val); + return -EINVAL; + } + hid_descriptor_address = val; + } else if (!hid_descriptor_address) { dev_err(dev, "HID register address not provided\n"); return -ENODEV; } - if (val >> 16) { - dev_err(dev, "Bad HID register address: 0x%08x\n", val); - return -EINVAL; - } - hid_descriptor_address = val; if (!device_property_read_u32(dev, "post-power-on-delay-ms", &val)) ihid_of->post_power_delay_ms = val; @@ -112,10 +148,11 @@ static int i2c_hid_of_probe(struct i2c_client *client) if (IS_ERR(ihid_of->reset_gpio)) return PTR_ERR(ihid_of->reset_gpio); - ihid_of->supplies[0].supply = "vdd"; - ihid_of->supplies[1].supply = "vddl"; - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ihid_of->supplies), - ihid_of->supplies); + ihid_of->num_supplies = chip_data->num_supplies; + for (i = 0; i < ihid_of->num_supplies; i++) + ihid_of->supplies[i].supply = chip_data->supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ihid_of->num_supplies, ihid_of->supplies); if (ret) return ret; From patchwork Sun Apr 9 14:42:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 671970 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 BF646C77B61 for ; Sun, 9 Apr 2023 14:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjDIOoM (ORCPT ); Sun, 9 Apr 2023 10:44:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjDIOoM (ORCPT ); Sun, 9 Apr 2023 10:44:12 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE4C33581 for ; Sun, 9 Apr 2023 07:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681051372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z75uK5oTG5VLvA3FDgeiE09Vw47NJELrgK12v0JrMmk=; b=DNJ2lcoUTyJAoFtzs+jGW3UWD8CBu6kc2PkFiCQpGNjaUksnETlf/mu5YaZld8pJ9uT56u Xt6t6vIY/FcGH/3ujlr10Vx5FEIML/7LAlGrDHH/dt7Nw0THjGjDp4r8xn1D3pNKugU585 BLy4X8OKbg5XsZ8TUnvFeiM8NMWZNz4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-gaihaSxjPMy1Ot-_me45Yw-1; Sun, 09 Apr 2023 10:42:50 -0400 X-MC-Unique: gaihaSxjPMy1Ot-_me45Yw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B8F3185A78F; Sun, 9 Apr 2023 14:42:50 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F9C2202701E; Sun, 9 Apr 2023 14:42:49 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Douglas Anderson Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH 5/6] HID: i2c-hid-of: Consolidate Elan support into generic i2c-hid-of driver Date: Sun, 9 Apr 2023 16:42:42 +0200 Message-Id: <20230409144243.25360-6-hdegoede@redhat.com> In-Reply-To: <20230409144243.25360-1-hdegoede@redhat.com> References: <20230409144243.25360-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The generic i2c-hid-of driver nowsupports a reset GPIO and allows setting the supply-names, hid_descriptor_address and delays through match_data / chip_data. This means that i2c-hid-of can be easily made to support the elan,ekth6915 compatible directly and the i2c-hid-of-elan driver can be dropped. Signed-off-by: Hans de Goede --- drivers/hid/i2c-hid/Kconfig | 15 --- drivers/hid/i2c-hid/Makefile | 1 - drivers/hid/i2c-hid/i2c-hid-of-elan.c | 129 -------------------------- drivers/hid/i2c-hid/i2c-hid-of.c | 14 +++ 4 files changed, 14 insertions(+), 145 deletions(-) delete mode 100644 drivers/hid/i2c-hid/i2c-hid-of-elan.c diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig index 3be17109301a..6aa7cf18fd2d 100644 --- a/drivers/hid/i2c-hid/Kconfig +++ b/drivers/hid/i2c-hid/Kconfig @@ -38,21 +38,6 @@ config I2C_HID_OF will be called i2c-hid-of. It will also build/depend on the module i2c-hid. -config I2C_HID_OF_ELAN - tristate "Driver for Elan hid-i2c based devices on OF systems" - depends on OF - select I2C_HID_CORE - help - Say Y here if you want support for Elan i2c devices that use - the i2c-hid protocol on Open Firmware (Device Tree)-based - systems. - - If unsure, say N. - - This support is also available as a module. If so, the module - will be called i2c-hid-of-elan. It will also build/depend on - the module i2c-hid. - config I2C_HID_OF_GOODIX tristate "Driver for Goodix hid-i2c based devices on OF systems" depends on OF diff --git a/drivers/hid/i2c-hid/Makefile b/drivers/hid/i2c-hid/Makefile index 55bd5e0f35af..302545a771f3 100644 --- a/drivers/hid/i2c-hid/Makefile +++ b/drivers/hid/i2c-hid/Makefile @@ -10,5 +10,4 @@ i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o obj-$(CONFIG_I2C_HID_ACPI) += i2c-hid-acpi.o obj-$(CONFIG_I2C_HID_OF) += i2c-hid-of.o -obj-$(CONFIG_I2C_HID_OF_ELAN) += i2c-hid-of-elan.o obj-$(CONFIG_I2C_HID_OF_GOODIX) += i2c-hid-of-goodix.o diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c deleted file mode 100644 index 76ddc8be1cbb..000000000000 --- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c +++ /dev/null @@ -1,129 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Driver for Elan touchscreens that use the i2c-hid protocol. - * - * Copyright 2020 Google LLC - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "i2c-hid.h" - -struct elan_i2c_hid_chip_data { - unsigned int post_gpio_reset_delay_ms; - unsigned int post_power_delay_ms; - u16 hid_descriptor_address; -}; - -struct i2c_hid_of_elan { - struct i2chid_ops ops; - - struct regulator *vcc33; - struct regulator *vccio; - struct gpio_desc *reset_gpio; - const struct elan_i2c_hid_chip_data *chip_data; -}; - -static int elan_i2c_hid_power_up(struct i2chid_ops *ops) -{ - struct i2c_hid_of_elan *ihid_elan = - container_of(ops, struct i2c_hid_of_elan, ops); - int ret; - - ret = regulator_enable(ihid_elan->vcc33); - if (ret) - return ret; - - ret = regulator_enable(ihid_elan->vccio); - if (ret) { - regulator_disable(ihid_elan->vcc33); - return ret; - } - - if (ihid_elan->chip_data->post_power_delay_ms) - 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); - - return 0; -} - -static void elan_i2c_hid_power_down(struct i2chid_ops *ops) -{ - struct i2c_hid_of_elan *ihid_elan = - container_of(ops, struct i2c_hid_of_elan, ops); - - gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1); - regulator_disable(ihid_elan->vccio); - regulator_disable(ihid_elan->vcc33); -} - -static int i2c_hid_of_elan_probe(struct i2c_client *client) -{ - struct i2c_hid_of_elan *ihid_elan; - - ihid_elan = devm_kzalloc(&client->dev, sizeof(*ihid_elan), GFP_KERNEL); - if (!ihid_elan) - return -ENOMEM; - - ihid_elan->ops.power_up = elan_i2c_hid_power_up; - ihid_elan->ops.power_down = elan_i2c_hid_power_down; - - /* Start out with reset asserted */ - ihid_elan->reset_gpio = - devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(ihid_elan->reset_gpio)) - return PTR_ERR(ihid_elan->reset_gpio); - - ihid_elan->vccio = devm_regulator_get(&client->dev, "vccio"); - 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); - - 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, - .hid_descriptor_address = 0x0001, -}; - -static const struct of_device_id elan_i2c_hid_of_match[] = { - { .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data }, - { } -}; -MODULE_DEVICE_TABLE(of, elan_i2c_hid_of_match); - -static struct i2c_driver elan_i2c_hid_ts_driver = { - .driver = { - .name = "i2c_hid_of_elan", - .pm = &i2c_hid_core_pm, - .probe_type = PROBE_PREFER_ASYNCHRONOUS, - .of_match_table = of_match_ptr(elan_i2c_hid_of_match), - }, - .probe_new = i2c_hid_of_elan_probe, - .remove = i2c_hid_core_remove, - .shutdown = i2c_hid_core_shutdown, -}; -module_i2c_driver(elan_i2c_hid_ts_driver); - -MODULE_AUTHOR("Douglas Anderson "); -MODULE_DESCRIPTION("Elan i2c-hid touchscreen driver"); -MODULE_LICENSE("GPL"); diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index 4fafef1e36b9..313eb198d840 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -167,8 +167,22 @@ static int i2c_hid_of_probe(struct i2c_client *client) } #ifdef CONFIG_OF +static const char * const elan_ekth6915_supply_names[] = { + "vcc33", + "vccio", +}; + +static const struct i2c_hid_of_chip_data elan_ekth6915_chip_data = { + .supply_names = elan_ekth6915_supply_names, + .num_supplies = ARRAY_SIZE(elan_ekth6915_supply_names), + .post_power_delay_ms = 1, + .post_reset_delay_ms = 300, + .hid_descriptor_address = 0x0001, +}; + static const struct of_device_id i2c_hid_of_match[] = { { .compatible = "hid-over-i2c" }, + { .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data }, {}, }; MODULE_DEVICE_TABLE(of, i2c_hid_of_match); From patchwork Sun Apr 9 14:42:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 672193 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 52EBAC77B70 for ; Sun, 9 Apr 2023 14:44:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229563AbjDIOoO (ORCPT ); Sun, 9 Apr 2023 10:44:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjDIOoN (ORCPT ); Sun, 9 Apr 2023 10:44:13 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D77DD3AA8 for ; Sun, 9 Apr 2023 07:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681051374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bffvzhb5EeXETtOZcWA1ovMDmuOkMFT3gveiE/JJTro=; b=diytOM8Eq6MULekmtNpegmeOOO+3QONW/JgwzkVj/grvG6RY7j1VmcdfIcZGShKy/yAig8 2gOT7xSp47d3qAOXlMSywnKAYMGrijnYmiv127w0wYQXj3DraBpTiEdHZuRKgVQtSEVyld /w9BxKtUFaFHlH/yZuaeWHOH0kQep1Q= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-450-w5oVrwcdMzWHuAB8BsajpA-1; Sun, 09 Apr 2023 10:42:51 -0400 X-MC-Unique: w5oVrwcdMzWHuAB8BsajpA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4AD933801F6A; Sun, 9 Apr 2023 14:42:51 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E793202701E; Sun, 9 Apr 2023 14:42:50 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Douglas Anderson Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH 6/6] HID: i2c-hid-of: Consolidate Goodix support into generic i2c-hid-of driver Date: Sun, 9 Apr 2023 16:42:43 +0200 Message-Id: <20230409144243.25360-7-hdegoede@redhat.com> In-Reply-To: <20230409144243.25360-1-hdegoede@redhat.com> References: <20230409144243.25360-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The generic i2c-hid-of driver nowsupports a reset GPIO and allows setting the supply-names, hid_descriptor_address and delays through match_data / chip_data. This means that i2c-hid-of can be easily made to support the goodix,gt7375p compatible directly and the i2c-hid-of-goodix driver can be dropped. Signed-off-by: Hans de Goede --- drivers/hid/i2c-hid/Kconfig | 15 --- drivers/hid/i2c-hid/Makefile | 1 - drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 125 ------------------------ drivers/hid/i2c-hid/i2c-hid-of.c | 14 +++ 4 files changed, 14 insertions(+), 141 deletions(-) delete mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig index 6aa7cf18fd2d..10e4b368b818 100644 --- a/drivers/hid/i2c-hid/Kconfig +++ b/drivers/hid/i2c-hid/Kconfig @@ -38,21 +38,6 @@ config I2C_HID_OF will be called i2c-hid-of. It will also build/depend on the module i2c-hid. -config I2C_HID_OF_GOODIX - tristate "Driver for Goodix hid-i2c based devices on OF systems" - depends on OF - select I2C_HID_CORE - help - Say Y here if you want support for Goodix i2c devices that use - the i2c-hid protocol on Open Firmware (Device Tree)-based - systems. - - If unsure, say N. - - This support is also available as a module. If so, the module - will be called i2c-hid-of-goodix. It will also build/depend on - the module i2c-hid. - config I2C_HID_CORE tristate endif diff --git a/drivers/hid/i2c-hid/Makefile b/drivers/hid/i2c-hid/Makefile index 302545a771f3..9b4a73446841 100644 --- a/drivers/hid/i2c-hid/Makefile +++ b/drivers/hid/i2c-hid/Makefile @@ -10,4 +10,3 @@ i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o obj-$(CONFIG_I2C_HID_ACPI) += i2c-hid-acpi.o obj-$(CONFIG_I2C_HID_OF) += i2c-hid-of.o -obj-$(CONFIG_I2C_HID_OF_GOODIX) += i2c-hid-of-goodix.o diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c deleted file mode 100644 index 0060e3dcd775..000000000000 --- a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c +++ /dev/null @@ -1,125 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Driver for Goodix touchscreens that use the i2c-hid protocol. - * - * Copyright 2020 Google LLC - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "i2c-hid.h" - -struct goodix_i2c_hid_timing_data { - unsigned int post_gpio_reset_delay_ms; - unsigned int post_power_delay_ms; -}; - -struct i2c_hid_of_goodix { - struct i2chid_ops ops; - - struct regulator *vdd; - struct regulator *vddio; - struct gpio_desc *reset_gpio; - const struct goodix_i2c_hid_timing_data *timings; -}; - -static int goodix_i2c_hid_power_up(struct i2chid_ops *ops) -{ - struct i2c_hid_of_goodix *ihid_goodix = - container_of(ops, struct i2c_hid_of_goodix, ops); - int ret; - - ret = regulator_enable(ihid_goodix->vdd); - if (ret) - return ret; - - ret = regulator_enable(ihid_goodix->vddio); - if (ret) - return ret; - - if (ihid_goodix->timings->post_power_delay_ms) - msleep(ihid_goodix->timings->post_power_delay_ms); - - gpiod_set_value_cansleep(ihid_goodix->reset_gpio, 0); - if (ihid_goodix->timings->post_gpio_reset_delay_ms) - msleep(ihid_goodix->timings->post_gpio_reset_delay_ms); - - return 0; -} - -static void goodix_i2c_hid_power_down(struct i2chid_ops *ops) -{ - struct i2c_hid_of_goodix *ihid_goodix = - container_of(ops, struct i2c_hid_of_goodix, ops); - - gpiod_set_value_cansleep(ihid_goodix->reset_gpio, 1); - regulator_disable(ihid_goodix->vddio); - regulator_disable(ihid_goodix->vdd); -} - -static int i2c_hid_of_goodix_probe(struct i2c_client *client) -{ - struct i2c_hid_of_goodix *ihid_goodix; - - ihid_goodix = devm_kzalloc(&client->dev, sizeof(*ihid_goodix), - GFP_KERNEL); - if (!ihid_goodix) - return -ENOMEM; - - ihid_goodix->ops.power_up = goodix_i2c_hid_power_up; - ihid_goodix->ops.power_down = goodix_i2c_hid_power_down; - - /* Start out with reset asserted */ - ihid_goodix->reset_gpio = - devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(ihid_goodix->reset_gpio)) - return PTR_ERR(ihid_goodix->reset_gpio); - - ihid_goodix->vdd = devm_regulator_get(&client->dev, "vdd"); - if (IS_ERR(ihid_goodix->vdd)) - return PTR_ERR(ihid_goodix->vdd); - - ihid_goodix->vddio = devm_regulator_get(&client->dev, "mainboard-vddio"); - if (IS_ERR(ihid_goodix->vddio)) - return PTR_ERR(ihid_goodix->vddio); - - ihid_goodix->timings = device_get_match_data(&client->dev); - - return i2c_hid_core_probe(client, &ihid_goodix->ops, 0x0001, 0); -} - -static const struct goodix_i2c_hid_timing_data goodix_gt7375p_timing_data = { - .post_power_delay_ms = 10, - .post_gpio_reset_delay_ms = 180, -}; - -static const struct of_device_id goodix_i2c_hid_of_match[] = { - { .compatible = "goodix,gt7375p", .data = &goodix_gt7375p_timing_data }, - { } -}; -MODULE_DEVICE_TABLE(of, goodix_i2c_hid_of_match); - -static struct i2c_driver goodix_i2c_hid_ts_driver = { - .driver = { - .name = "i2c_hid_of_goodix", - .pm = &i2c_hid_core_pm, - .probe_type = PROBE_PREFER_ASYNCHRONOUS, - .of_match_table = of_match_ptr(goodix_i2c_hid_of_match), - }, - .probe_new = i2c_hid_of_goodix_probe, - .remove = i2c_hid_core_remove, - .shutdown = i2c_hid_core_shutdown, -}; -module_i2c_driver(goodix_i2c_hid_ts_driver); - -MODULE_AUTHOR("Douglas Anderson "); -MODULE_DESCRIPTION("Goodix i2c-hid touchscreen driver"); -MODULE_LICENSE("GPL v2"); diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index 313eb198d840..7f298210447a 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -180,9 +180,23 @@ static const struct i2c_hid_of_chip_data elan_ekth6915_chip_data = { .hid_descriptor_address = 0x0001, }; +static const char * const goodix_gt7375p_supply_names[] = { + "vdd", + "mainboard-vddio", +}; + +static const struct i2c_hid_of_chip_data goodix_gt7375p_chip_data = { + .supply_names = goodix_gt7375p_supply_names, + .num_supplies = ARRAY_SIZE(goodix_gt7375p_supply_names), + .post_power_delay_ms = 10, + .post_reset_delay_ms = 180, + .hid_descriptor_address = 0x0001, +}; + static const struct of_device_id i2c_hid_of_match[] = { { .compatible = "hid-over-i2c" }, { .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data }, + { .compatible = "goodix,gt7375p", .data = &goodix_gt7375p_chip_data }, {}, }; MODULE_DEVICE_TABLE(of, i2c_hid_of_match);