From patchwork Thu Dec 2 11:56:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair X-Patchwork-Id: 520849 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 5C17BC433EF for ; Thu, 2 Dec 2021 11:56:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231598AbhLBMAN (ORCPT ); Thu, 2 Dec 2021 07:00:13 -0500 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:49119 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346568AbhLBL77 (ORCPT ); Thu, 2 Dec 2021 06:59:59 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id C435E580270; Thu, 2 Dec 2021 06:56:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 02 Dec 2021 06:56:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=XXHhIZecWEbbp w/wt6LKfLxH0GHT7xbD6LEPfEWZbjk=; b=omwwfDH7KHaymIbl1t/iWxnXZH+CD qaTH0vimpBCxcVeIiUN4z+GPQBhrCzgoQ4UElorJjOFExmPr6xvaoRwSZSr6S7y7 4bhOuhr5uR/H58vx0VyZfo31McnVAVpF05sk2lKSPoLw8Cv5W4SBCmNxhAxVoBIy RVRpO2hXs9Bp8IknbOvvbDjQaNMx0yh2YDlyjQX57b2DXgS8lYa4yOb4kHjHYuVr uYZ7yBCDPq8rbZaVlvOagbbAkJkmfHyg4uKpcDS2pYozty+rUo6YRIDWGwTCsKlm 2kS35AIIqOdSntaHBpWNTTrAL9GX8twXOZCWh5xFtWU0vbi3t+aDJF0CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=XXHhIZecWEbbpw/wt6LKfLxH0GHT7xbD6LEPfEWZbjk=; b=l6DVA7qr 3f7KXOjLtUNLLAo+1jQ4EN/7Y2+N//fHZ/OTnhtU7yZ1lFjunPmKMthvP0YW5ecw L2PqGhRqx5hwLdcd6jpeGfp+5+dVdVccoK+Hrj0eGMcpUwx34afdFQcxDWp8nL1o 9uaz1ndwoe2Es4M7kOfJSlhzPr8UYo4h7QPifi4nW5HeDM554ff1E/Ce3tCNUyxw acceWm1hk8y5SXBdkWXhUo+QmjgTj/hlXtlup0rnjl0H0htRJuTH5x0uF2TV9aeC 9i8XkTcinbcW8ndTlEp88a1cfQ8Lk7woslD2HjqInUNBV3ivDhA0Ci/934V6AoXt Zs2zVzmnmCVPKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrieehgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeetlhhishhtrghirhcuhfhrrghntghishcuoegrlhhishhtrghi rhesrghlihhsthgrihhrvdefrdhmvgeqnecuggftrfgrthhtvghrnhepgeegtdetjeekge eguefgheeuvedugedvteejveeiudegvddtkeffkeehtdetudfhnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprghlihhsthgrihhrsegrlhhish htrghirhdvfedrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Dec 2021 06:56:30 -0500 (EST) From: Alistair Francis To: benjamin.tissoires@redhat.com, shawnguo@kernel.org, s.hauer@pengutronix.de, dmitry.torokhov@gmail.com Cc: Ping.Cheng@wacom.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, alistair23@gmail.com, tatsunosuke.tobita@wacom.com, linux-input@vger.kernel.org, Jason.Gerecke@wacom.com, linux-kernel@vger.kernel.org, jikos@kernel.org, martin.chen@wacom.com, devicetree@vger.kernel.org, Alistair Francis Subject: [PATCH v15 1/3] HID: quirks: Allow inverting the absolute X/Y values Date: Thu, 2 Dec 2021 21:56:20 +1000 Message-Id: <20211202115622.40153-2-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211202115622.40153-1-alistair@alistair23.me> References: <20211202115622.40153-1-alistair@alistair23.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Add a HID_QUIRK_X_INVERT/HID_QUIRK_Y_INVERT quirk that can be used to invert the X/Y values. Signed-off-by: Alistair Francis --- drivers/hid/hid-input.c | 6 ++++++ include/linux/hid.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 217f2d1b91c5..83ee803186a1 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1331,6 +1331,12 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct input = field->hidinput->input; + if (usage->type == EV_ABS && + (((*quirks & HID_QUIRK_X_INVERT) && usage->code == ABS_X) || + ((*quirks & HID_QUIRK_Y_INVERT) && usage->code == ABS_Y))) { + value = field->logical_maximum - value; + } + if (usage->hat_min < usage->hat_max || usage->hat_dir) { int hat_dir = usage->hat_dir; if (!hat_dir) diff --git a/include/linux/hid.h b/include/linux/hid.h index 9e067f937dbc..4959385ca588 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -349,6 +349,8 @@ struct hid_item { /* BIT(9) reserved for backward compatibility, was NO_INIT_INPUT_REPORTS */ #define HID_QUIRK_ALWAYS_POLL BIT(10) #define HID_QUIRK_INPUT_PER_APP BIT(11) +#define HID_QUIRK_X_INVERT BIT(12) +#define HID_QUIRK_Y_INVERT BIT(13) #define HID_QUIRK_SKIP_OUTPUT_REPORTS BIT(16) #define HID_QUIRK_SKIP_OUTPUT_REPORT_ID BIT(17) #define HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP BIT(18) From patchwork Thu Dec 2 11:56:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair X-Patchwork-Id: 520848 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 0ACF3C433FE for ; Thu, 2 Dec 2021 11:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357492AbhLBMAO (ORCPT ); Thu, 2 Dec 2021 07:00:14 -0500 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:56551 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357516AbhLBMAG (ORCPT ); Thu, 2 Dec 2021 07:00:06 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 13A685801C3; Thu, 2 Dec 2021 06:56:43 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 02 Dec 2021 06:56:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=26DZ6/M3MgY9T a1v7+h0aelpWpuLYRAnVemoNeSeL34=; b=qbPwQzzImtvXmN+nIkzCQiE/Weo4N kX2pqBgxepoShTAdmbsf95DweeOYu2L5tDbxLLkldL3URGrjMvr+TPIBcRANOINe DB8TkWS//Q9q8A8yWhwM0Cnq0n/CaYP9SdNM7I41cdp2+zD9vjxgrRursbb4jP3q Xpwrbk6abtP935Y019KI4TZ5pscXQJGuY31Xr7AZyNcNiMAnWlO0ZWn/d9DNNjap sY80I+1WzT/diHpZjZA70dyAqQZAY4APWgsBKVMfEBPUX9ukQb408pEf5C6YBohK Jly+9IXsajTv6CaCLQdz6VuYYBs0QCdR/XYMYbKSICvApUVvr8p1TaHWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=26DZ6/M3MgY9Ta1v7+h0aelpWpuLYRAnVemoNeSeL34=; b=ARmz9XA4 847OSTnv9BdNptn+VAawsdRjCI0a/JJJ5pmS2dP0XB3o6eRlOq7u8IhWtzOO7Agg wwjBIXkdk6tfJNDzhwH0j4nWdhI65d/SEXY8U89pcT8JOfI1Lzih/nUaOcpCKMzn aLmoXX1gHqEWuArTBD2OVnC16biyDRUEMksAINYdih/jgwF6atoXlVYOTX1LJJok PfuARV82nMNffWwbwpaBBTPcGxvxTfoSyyyFJO3N0tWtMzBjlbfs17ORJQx5hj61 zrHPU7ZJHO4SgNTuCHlusQrUnQ0lmIw4ydQ5YrtOkkrlfbwBg449fhcVzKVqNQnm n+H0oY2+pr7TFw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrieehgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlihhsthgr ihhrucfhrhgrnhgtihhsuceorghlihhsthgrihhrsegrlhhishhtrghirhdvfedrmhgvqe enucggtffrrghtthgvrhhnpeeggedtteejkeeggeeugfehueevudegvdetjeeviedugedv tdekffekhedtteduhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrih hlfhhrohhmpegrlhhishhtrghirhesrghlihhsthgrihhrvdefrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Dec 2021 06:56:37 -0500 (EST) From: Alistair Francis To: benjamin.tissoires@redhat.com, shawnguo@kernel.org, s.hauer@pengutronix.de, dmitry.torokhov@gmail.com Cc: Ping.Cheng@wacom.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, alistair23@gmail.com, tatsunosuke.tobita@wacom.com, linux-input@vger.kernel.org, Jason.Gerecke@wacom.com, linux-kernel@vger.kernel.org, jikos@kernel.org, martin.chen@wacom.com, devicetree@vger.kernel.org, Alistair Francis , Rob Herring Subject: [PATCH v15 2/3] HID: i2c-hid-of: Expose the touchscreen-inverted properties Date: Thu, 2 Dec 2021 21:56:21 +1000 Message-Id: <20211202115622.40153-3-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211202115622.40153-1-alistair@alistair23.me> References: <20211202115622.40153-1-alistair@alistair23.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Allow the touchscreen-inverted-x/y device tree properties to control the HID_QUIRK_X_INVERT/HID_QUIRK_Y_INVERT quirks for the hid-input device. Signed-off-by: Alistair Francis Acked-by: Rob Herring --- .../devicetree/bindings/input/hid-over-i2c.txt | 2 ++ drivers/hid/i2c-hid/i2c-hid-acpi.c | 2 +- drivers/hid/i2c-hid/i2c-hid-core.c | 4 +++- drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 2 +- drivers/hid/i2c-hid/i2c-hid-of.c | 11 ++++++++++- drivers/hid/i2c-hid/i2c-hid.h | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/input/hid-over-i2c.txt b/Documentation/devicetree/bindings/input/hid-over-i2c.txt index c76bafaf98d2..34c43d3bddfd 100644 --- a/Documentation/devicetree/bindings/input/hid-over-i2c.txt +++ b/Documentation/devicetree/bindings/input/hid-over-i2c.txt @@ -32,6 +32,8 @@ device-specific compatible properties, which should be used in addition to the - vdd-supply: phandle of the regulator that provides the supply voltage. - post-power-on-delay-ms: time required by the device after enabling its regulators or powering it on, before it is ready for communication. +- touchscreen-inverted-x: See touchscreen.txt +- touchscreen-inverted-y: See touchscreen.txt Example: diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index a6f0257a26de..b96ae15e0ad9 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -111,7 +111,7 @@ static int i2c_hid_acpi_probe(struct i2c_client *client) } return i2c_hid_core_probe(client, &ihid_acpi->ops, - hid_descriptor_address); + hid_descriptor_address, 0); } static const struct acpi_device_id i2c_hid_acpi_match[] = { diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 517141138b00..4804d71e5293 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -912,7 +912,7 @@ static void i2c_hid_core_shutdown_tail(struct i2c_hid *ihid) } int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, - u16 hid_descriptor_address) + u16 hid_descriptor_address, u32 quirks) { int ret; struct i2c_hid *ihid; @@ -1009,6 +1009,8 @@ int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, goto err_mem_free; } + hid->quirks |= quirks; + return 0; err_mem_free: diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c index 52674149a275..b4dad66fa954 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c +++ b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c @@ -150,7 +150,7 @@ static int i2c_hid_of_goodix_probe(struct i2c_client *client, goodix_i2c_hid_deassert_reset(ihid_goodix, true); mutex_unlock(&ihid_goodix->regulator_mutex); - return i2c_hid_core_probe(client, &ihid_goodix->ops, 0x0001); + return i2c_hid_core_probe(client, &ihid_goodix->ops, 0x0001, 0); } static const struct goodix_i2c_hid_timing_data goodix_gt7375p_timing_data = { diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index 4bf7cea92637..b16349d6e9de 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 @@ -71,6 +72,7 @@ static int i2c_hid_of_probe(struct i2c_client *client, struct device *dev = &client->dev; struct i2c_hid_of *ihid_of; u16 hid_descriptor_address; + u32 quirks = 0; int ret; u32 val; @@ -105,8 +107,15 @@ static int i2c_hid_of_probe(struct i2c_client *client, if (ret) return ret; + if (device_property_read_bool(dev, "touchscreen-inverted-x")) { + quirks |= HID_QUIRK_X_INVERT; + } + if (device_property_read_bool(dev, "touchscreen-inverted-y")) { + quirks |= HID_QUIRK_Y_INVERT; + } + return i2c_hid_core_probe(client, &ihid_of->ops, - hid_descriptor_address); + hid_descriptor_address, quirks); } static const struct of_device_id i2c_hid_of_match[] = { diff --git a/drivers/hid/i2c-hid/i2c-hid.h b/drivers/hid/i2c-hid/i2c-hid.h index 05a7827d211a..236cc062d5ef 100644 --- a/drivers/hid/i2c-hid/i2c-hid.h +++ b/drivers/hid/i2c-hid/i2c-hid.h @@ -32,7 +32,7 @@ struct i2chid_ops { }; int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, - u16 hid_descriptor_address); + u16 hid_descriptor_address, u32 quirks); int i2c_hid_core_remove(struct i2c_client *client); void i2c_hid_core_shutdown(struct i2c_client *client); From patchwork Thu Dec 2 11:56:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair X-Patchwork-Id: 519960 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 A4DA8C433EF for ; Thu, 2 Dec 2021 11:56:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357497AbhLBMAQ (ORCPT ); Thu, 2 Dec 2021 07:00:16 -0500 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:47151 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357554AbhLBMAM (ORCPT ); Thu, 2 Dec 2021 07:00:12 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 6B5965801C3; Thu, 2 Dec 2021 06:56:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 02 Dec 2021 06:56:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=FvePu4DfaAI5Y pELNve5G7W9fZNbhwwYhYrMJeaayx4=; b=KM9Tlfq7ZmpHTvPmaRA34UC0sPEDr vw2MhIE4MjaCdy8UYkIDSJbYG/a7g00m74637K1pxIE1U0hg6gkv055KxctnDaJY 3CjmVh6p4DLC7K9XOBfHHMSSZxPEytaajWHSm6IEApeGtUSe0IuwBtBg6q0uVzVb TABaJ61R8V8VU4X7UdM7sPIhELt9p5lQwxPGc720frZD28hIqVAm109vAXN6WlSL 9RmJtNcGUzCa23bijVIE5RO1vQaSUkbyHda+pMAEZkYk03Uujk8Seo7EoKtRyKb+ S51DoDAyBB3uqYCf+RbV3LGYJjnnAwuo7gGHp1kB26YwUpGzyY6efghmw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=FvePu4DfaAI5YpELNve5G7W9fZNbhwwYhYrMJeaayx4=; b=OcL96ON+ 2kK5nKID4pKY8sAR2jgd055cIdIfEfE50Jv23ZYgSf33eKMgAKzlfW2XdJIxTcxy 4y/R+lSbf2NX4uC3o9mIcn/NSllVmoJUarNlaF9PZNJyvg7A8ierXHhpiTCcvZ1k GEUnPzwf8I9JBoAanlVyUp9Z1YXKsclv5hp17w4JkZRd5/SLV9GsT10fqjz2nRff bFSgNYfDXzLzVYxHeD/3D08t1Y4BmKy/2n8WGnATpPnLdXgQwAY7WXlAX4vX0QDe vbjzWCxGrzlzvs0B74PdZtt2W8bQUUJwY0Z7yYMHj9GuOeln6mMgVLBVjDC157sT eM1Q9zrR/5yUdA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrieehgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeetlhhishhtrghirhcuhfhrrghntghishcuoegrlhhishhtrghi rhesrghlihhsthgrihhrvdefrdhmvgeqnecuggftrfgrthhtvghrnhepgeegtdetjeekge eguefgheeuvedugedvteejveeiudegvddtkeffkeehtdetudfhnecuvehluhhsthgvrhfu ihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomheprghlihhsthgrihhrsegrlhhish htrghirhdvfedrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Dec 2021 06:56:43 -0500 (EST) From: Alistair Francis To: benjamin.tissoires@redhat.com, shawnguo@kernel.org, s.hauer@pengutronix.de, dmitry.torokhov@gmail.com Cc: Ping.Cheng@wacom.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, alistair23@gmail.com, tatsunosuke.tobita@wacom.com, linux-input@vger.kernel.org, Jason.Gerecke@wacom.com, linux-kernel@vger.kernel.org, jikos@kernel.org, martin.chen@wacom.com, devicetree@vger.kernel.org, Alistair Francis Subject: [PATCH v15 3/3] ARM: dts: imx7d: remarkable2: add wacom digitizer device Date: Thu, 2 Dec 2021 21:56:22 +1000 Message-Id: <20211202115622.40153-4-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211202115622.40153-1-alistair@alistair23.me> References: <20211202115622.40153-1-alistair@alistair23.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Signed-off-by: Alistair Francis --- arch/arm/boot/dts/imx7d-remarkable2.dts | 59 +++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/arch/arm/boot/dts/imx7d-remarkable2.dts b/arch/arm/boot/dts/imx7d-remarkable2.dts index 89cbf13097a4..a2a91bfdd98e 100644 --- a/arch/arm/boot/dts/imx7d-remarkable2.dts +++ b/arch/arm/boot/dts/imx7d-remarkable2.dts @@ -34,6 +34,19 @@ reg_brcm: regulator-brcm { startup-delay-us = <150>; }; + reg_digitizer: regulator-digitizer { + compatible = "regulator-fixed"; + regulator-name = "VDD_3V3_DIGITIZER"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_digitizer_reg>; + pinctrl-1 = <&pinctrl_digitizer_reg>; + gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>; + enable-active-high; + startup-delay-us = <100000>; /* 100 ms */ + }; + wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; pinctrl-names = "default"; @@ -51,6 +64,26 @@ &clks { assigned-clock-rates = <0>, <32768>; }; +&i2c1 { + clock-frequency = <400000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + wacom_digitizer: digitizer@9 { + compatible = "hid-over-i2c"; + reg = <0x09>; + hid-descr-addr = <0x01>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wacom>; + interrupt-parent = <&gpio1>; + interrupts = <1 IRQ_TYPE_LEVEL_LOW>; + touchscreen-inverted-x; + touchscreen-inverted-y; + vdd-supply = <®_digitizer>; + }; +}; + &snvs_pwrkey { status = "okay"; }; @@ -117,6 +150,25 @@ &wdog1 { fsl,ext-reset-output; }; +&iomuxc_lpsr { + pinctrl_digitizer_reg: digitizerreggrp { + fsl,pins = < + /* DIGITIZER_PWR_EN */ + MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x14 + >; + }; + + pinctrl_wacom: wacomgrp { + fsl,pins = < + /*MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x00000014 FWE */ + MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x00000074 /* PDCTB */ + MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x00000034 /* WACOM INT */ + /*MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x00000014 WACOM PWR ENABLE */ + /*MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x00000074 WACOM RESET */ + >; + }; +}; + &iomuxc { pinctrl_brcm_reg: brcmreggrp { fsl,pins = < @@ -125,6 +177,13 @@ MX7D_PAD_SAI1_TX_BCLK__GPIO6_IO13 0x14 >; }; + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f + MX7D_PAD_I2C1_SCL__I2C1_SCL 0x4000007f + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX 0x79