From patchwork Wed Dec 8 12:40:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 12664363 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 D7C99C433EF for ; Wed, 8 Dec 2021 12:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233612AbhLHMod (ORCPT ); Wed, 8 Dec 2021 07:44:33 -0500 Received: from new4-smtp.messagingengine.com ([66.111.4.230]:46655 "EHLO new4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233610AbhLHMod (ORCPT ); Wed, 8 Dec 2021 07:44:33 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 0C49D580269; Wed, 8 Dec 2021 07:41:01 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 08 Dec 2021 07:41:01 -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=Qc4G35IAQu4qPzpj/pU5z9Z5sUQgk NbeFGUU+3398Yasf3swb190ngYr6jxa5OEhn/KpqFK85mGrLgKcjv2YYY44NXZc0 V1EzBAKwyDsMsrCosnhurdaHMX76vcxRRisuF9isMN5rhFv/vkiNI//PXHZ+12uN 6B3YcNqvzplQUz3HGjvdNIjwbGObsxAYLEjqoDwhElLWldSwv3hOkuZHY0Jie3u0 XWBJRIwHWoOn4VFt9KbDJ56v8Ls1ovAxEGnAYN9HwUMy8WJ58h1tG0X3uvTCjkig 73dzS48R8hnOrpIyKZ0OIktSwaxBSGQbAVc3bDFTv5KSaK1K+dAHkfDGQ== 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=dV74NZPP xjzFLMlwQ5qcqHF46vzLiBr+i0tvoe4V6G6Mo7XOHPLUc/oGI9iJIILLHABVlggh zhQlP38Hqi7BWGqSNqYDe18Q7s3GRanD7U3gkMCjDX75AC66S5L/8tluwnmdRkI0 TxFC133kE3tJ/GQqd9K/8QKXiDTtigEl+RZQ3XSko0Zs6DB8vZ8G9sWigQWn6FBo p+1zQQ2qvHz1eMQvgbSxT5t/488qO7R2Vagf+oD2SkQyk5sFcIE1OaeMBFScvunx Uq68h8M7jUgqcElMYdFdWndAtbYK/GShwOfj2ppCA3OURrOkNhBLke15zgqW15I2 VKU3QQ5bnt2RWw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrjeekgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeetlhhishhtrghirhcuhfhrrghntghishcuoegrlhhishhtrghi rhesrghlihhsthgrihhrvdefrdhmvgeqnecuggftrfgrthhtvghrnhepgeegtdetjeekge eguefgheeuvedugedvteejveeiudegvddtkeffkeehtdetudfhnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprghlihhsthgrihhrsegrlhhish htrghirhdvfedrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 8 Dec 2021 07:40:55 -0500 (EST) From: Alistair Francis To: s.hauer@pengutronix.de, shawnguo@kernel.org, dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com Cc: jikos@kernel.org, linux-kernel@vger.kernel.org, alistair23@gmail.com, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, Jason.Gerecke@wacom.com, linux-imx@nxp.com, Ping.Cheng@wacom.com, devicetree@vger.kernel.org, martin.chen@wacom.com, tatsunosuke.tobita@wacom.com, Alistair Francis Subject: [PATCH v16 1/3] HID: quirks: Allow inverting the absolute X/Y values Date: Wed, 8 Dec 2021 22:40:43 +1000 Message-Id: <20211208124045.61815-2-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211208124045.61815-1-alistair@alistair23.me> References: <20211208124045.61815-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 Wed Dec 8 12:40:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 12664365 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 DBD00C433FE for ; Wed, 8 Dec 2021 12:41:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233622AbhLHMok (ORCPT ); Wed, 8 Dec 2021 07:44:40 -0500 Received: from new4-smtp.messagingengine.com ([66.111.4.230]:50367 "EHLO new4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233637AbhLHMoj (ORCPT ); Wed, 8 Dec 2021 07:44:39 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id AD7C6580365; Wed, 8 Dec 2021 07:41:07 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 08 Dec 2021 07:41:07 -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=nFBPQMZbNtD9OSoswld4gCf8fKmND XsVi0MEr7yGQ9sCbf1MkFiryDklN/cAoRDC6W/qCgFOr3XLT6WGh9ZTOgqD60K2Q V/GXuYMQUDHTrkd5B8lAtXNjuIo53wRxFOYjxAks8vTMIVkgZXwIxspClf0O4dx5 ECyOee0JebA4exMM7l+Tera85Vh36yTRJjtz9LUd6J7//dNTRGnNjmRrpS3BpOV7 djifjimGMaf08Efp5XvjScWvS02hfDNXyhbi7WAFNMLvJquevqdK9gx5Srm04+vU 2CQHVJqND4RrDICjwXV4KA6SXawqR2f3tzzYCBMgSDU4ihrQn6nS+lidQ== 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=YL1sR1ZD T5HhvV/vS8+1VSQhvQpvv4Ocvvq1CnqLGW3RykeMD4sFgWYnlPPkQ2uHYXVdy1h7 hqIxNVe0HYe4Wlzv1qseDB8Mz7h1IsmJTEJERYmCnNr1KBELJ19msUwalEgkqV57 GaR+yTMg57I7W6QbxR8GiGlhUA1FB2HxHilRk76LgnMSkSPnaUoliKhjPLO2TB1q Ei9jt0uQ7Fu6FWeIuYIop7gf4ROK5gUj1Eo22xUrRc24M4+r9wMs5PX4yJBXnGGp /XhgeuA8sg+ehzQYVoJz038YlYUhvLakHGnmU0MKoGla/cgqUFODLnaVHGyQeV+H BW3gKBnzQjY16A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrjeekgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlihhsthgr ihhrucfhrhgrnhgtihhsuceorghlihhsthgrihhrsegrlhhishhtrghirhdvfedrmhgvqe enucggtffrrghtthgvrhhnpeeggedtteejkeeggeeugfehueevudegvdetjeeviedugedv tdekffekhedtteduhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrih hlfhhrohhmpegrlhhishhtrghirhesrghlihhsthgrihhrvdefrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 8 Dec 2021 07:41:01 -0500 (EST) From: Alistair Francis To: s.hauer@pengutronix.de, shawnguo@kernel.org, dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com Cc: jikos@kernel.org, linux-kernel@vger.kernel.org, alistair23@gmail.com, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, Jason.Gerecke@wacom.com, linux-imx@nxp.com, Ping.Cheng@wacom.com, devicetree@vger.kernel.org, martin.chen@wacom.com, tatsunosuke.tobita@wacom.com, Alistair Francis , Rob Herring Subject: [PATCH v16 2/3] HID: i2c-hid-of: Expose the touchscreen-inverted properties Date: Wed, 8 Dec 2021 22:40:44 +1000 Message-Id: <20211208124045.61815-3-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211208124045.61815-1-alistair@alistair23.me> References: <20211208124045.61815-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 Wed Dec 8 12:40:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 12664367 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 F36C5C433EF for ; Wed, 8 Dec 2021 12:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233642AbhLHMoq (ORCPT ); Wed, 8 Dec 2021 07:44:46 -0500 Received: from new4-smtp.messagingengine.com ([66.111.4.230]:52827 "EHLO new4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233631AbhLHMoq (ORCPT ); Wed, 8 Dec 2021 07:44:46 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 02AAE580247; Wed, 8 Dec 2021 07:41:14 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 08 Dec 2021 07:41:14 -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=Xtb2ZyvQwiEmj aFTIab7ygGJDdh4OgdnrwNvxS0c+U0=; b=3D0ZAssEs0RKq9FoH4GlSFCifNLoz /tbNH1YZYgzKbz7AZJtEVlsKF7KjkO0vEdc+Gg8z7QSrby3ZvcOo3nPtBZXG1Kl8 81NaZIuM5OHkMXmIjO3vnbeS9/8XuyR//xwsgTLIDr1wK8oaCXb/cvF8pLJe9J7E EB6rlkAuc/FLFT7oQyFdST87ZSJuKnPJRS0w3OkC+3BvQ+f3qal8drDY897IxBts 5oD4VJNsmKHRA9TR/4v3muMEW22faVnPKYIzbCjnKKDVYvYsiS2t4k1cNymKQSzu qtVoPZQ5xi9efRpR5xZupw9fg/F7JxV6ZMsWSoyszYOZuF4V8kCtxhnLA== 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=Xtb2ZyvQwiEmjaFTIab7ygGJDdh4OgdnrwNvxS0c+U0=; b=M6LdJMZa w88FDYukWIi4j0z+XX7qW7PlScdq/Ud0kARHaNLm2N+xBZl7bd2u3UcCDGLL2EOe nVS3czhyRCaU8GYJ8gMOcsx8Uld6uho+rK6YKROVWktVUW4pSFxu0IVoTtgAXYIM vDn64zTt/BIb5lhR63LUQFyyCTDOVbkb+pGzv0lOHS0n8SDwxzZaLJpA8naepSor rLKXZdnQdheEWvecBW3RJmv33VfUba4NN+cFdYHRGN+C9wrrEu44Kz0mifZPS/nf XDmQF/dTULCo/1JCZShUCN84gfPOqrQJKxG7LcqsHP2AWlp9PjlSRVkuG1eu1xZh 3OIDn1Zy3Zq+ig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrjeekgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeetlhhishhtrghirhcuhfhrrghntghishcuoegrlhhishhtrghi rhesrghlihhsthgrihhrvdefrdhmvgeqnecuggftrfgrthhtvghrnhepgeegtdetjeekge eguefgheeuvedugedvteejveeiudegvddtkeffkeehtdetudfhnecuvehluhhsthgvrhfu ihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomheprghlihhsthgrihhrsegrlhhish htrghirhdvfedrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 8 Dec 2021 07:41:07 -0500 (EST) From: Alistair Francis To: s.hauer@pengutronix.de, shawnguo@kernel.org, dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com Cc: jikos@kernel.org, linux-kernel@vger.kernel.org, alistair23@gmail.com, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, Jason.Gerecke@wacom.com, linux-imx@nxp.com, Ping.Cheng@wacom.com, devicetree@vger.kernel.org, martin.chen@wacom.com, tatsunosuke.tobita@wacom.com, Alistair Francis Subject: [PATCH v16 3/3] ARM: dts: imx7d: remarkable2: add wacom digitizer device Date: Wed, 8 Dec 2021 22:40:45 +1000 Message-Id: <20211208124045.61815-4-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211208124045.61815-1-alistair@alistair23.me> References: <20211208124045.61815-1-alistair@alistair23.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Add Wacom I2C support for the reMarkable 2 eInk tablet using the generic I2C HID framework. 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