From nobody Fri Sep 25 23:54:11 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A537379ECD; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; cv=none; b=NlISkTSGaBh15HvOZ5oIRFjX9aTerbsmIh2sbg1F9Fqvt8thqVGJYgLrr49uPdGwAu19LCHhggunjgjKYda7Qg9AaiDp33R6UBudLgqAmAaNsJi1q/G0ZC4HuLB4qbVY2Tm87EjfJyvxJDdUJfYmETZnYxQG5If3kpHKCznjlLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; c=relaxed/simple; bh=hnblNZZZX74vCIQPbR7bbLsLlKR4prM6ow0xJLomnY4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vde/O2l+G18X1amHJfkCXZH5j1+lyLgXzmyk6h0CCJSspLEVIWQPa+xOMZNvupI8Yrp4okMTULsjh9V2b2Oamg8GOat9WoLq6LK3pa6z6JePuhDauY8mV/K7b07VfCWC80HeHR5YZkRsZReDjjOLlg302KTZhbH/iVFFlGVTZuw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZYf9AMVL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZYf9AMVL" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0721CC2BCF5; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788778227; bh=hnblNZZZX74vCIQPbR7bbLsLlKR4prM6ow0xJLomnY4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ZYf9AMVLCqqdHc2h1f1r+ZR52jmzwl7OhxC1m9g3Vz2FLBd9kjpS3Z95tQFEWHZ4s 3l0S99jfJhZCcnChuwoDtSDCRVsPbiCir9pifT/G4XeByi8zJa1oMZ0Q1+WMuToVnC P2+7WLJ2n5c0gRx/OIOb7S4gptPyX5Mm16XRW8dZTzWe1noXw5E5xjUb5paX7DiYcj CEdNxG6kcFqWR3PT69y+ljRobEbsJPAPNIxgkqO6/Ad9p8hysgrDcTjnDVqvwyxFcP pRssoOApUaMVPOcZTlmAlUavzpeNNdH44cCMizFTiOjxKfgN37YJGt2T6kwtDx/CSr uYf37dz/EZJFA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9793C79F99; Mon, 7 Sep 2026 10:50:26 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Mon, 07 Sep 2026 12:50:19 +0200 Subject: [PATCH v7 1/4] Input: stmfts - wait for controller ready after reset Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260907-stmfts5-v7-1-4a53381cd038@ixit.cz> References: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> In-Reply-To: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> To: Dmitry Torokhov , Maxime Coquelin , Alexandre Torgue , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg , Bjorn Andersson , Konrad Dybcio Cc: Petr Hodina , linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, phone-devel@vger.kernel.org, David Heidelberg , stable@vger.kernel.org X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4142; i=david@ixit.cz; h=from:subject:message-id; bh=YmMrxv3+joaFyhDdky+ZUqbM/9lF/0oWq3x6guxAV2s=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBqnpbwAwkKuZp8iMC+4TNWLuqzbOQ67FVsHERWr RQJfGwiAHeJAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCap6W8AAKCRBgAj/E00kg cs9AD/9mAd9wZH7ZvgdJcGEic/BXuAnUNEa+Gzd7l1ycSC/I+JEXEOMyi3KY8UVnRfcvFMqK9qp 6YZWzG2xGkIPJ7aoQNZQpLMS6BVs7lqGKuzpNmjcGM3P6inTAuj74yv/wVDPSUQfwzbETv6vtSP FUdlB3uXtHZ52nAzm/OiWnoNZPFI7d4IAYZdr7BWhl+IW6+lEgcowYYTZusMCOA2sBdLhxG1jvi 05/bDV02N8yxOsKy3UQTxKts9FmukAE8b4MCOVTgJihHOl6ysq4Drw5NH4SPZSkt66OY9WUvTEP gcpE2Tr7IsN0aTbN6iuN3500VnaKGVUjHSFMB2RYGwPlfy8BlaFzEsaZXCYkF6iJ6pd5GwnaKZz ez7k584X5VxNSZwMAmB8HYQ1+pph7+voLWEmRYuC8YzqTtNwWamHo+I2b+rg/m59Z0pQfN8L3B+ FwI2DGs0AgEpFnlgZwHAS5hU6Cji7tN5KG5UQoXuZFLAI3y02ErzRKgr1p4jrEIkWqhZyuTzPJA TnQgG8PEigcQkwAFyrESeY8W4zrHFaKNbo8QUkSDaQvkXTs0Z6jvEB/MAGxtUFvM8wgoJLXQPOe ymczNk9faRPZvJWGT4nNVSrAqPNTB6wP1FFEHhmXX2Xcpwb2FNjQXDulW2uzO3YSxSwI5HDz2S1 rkViDVpSK76Z/sQ== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz From: David Heidelberg After releasing the reset line stmfts_reset() sleeps a fixed 50 ms and stmfts_power_on() another 50 ms before the first I2C access. That is enough for a warm reset, but when both supplies were really cut during system suspend the controller boots from cold and can need longer. If it does, the first read fails, stmfts_resume() returns an error and the touchscreen is left powered off with its interrupt disabled. The controller posts a controller ready event once it has booted, and the event parser already completes cmd_done on it. Enable the interrupt right after releasing reset and wait for that event instead of sleeping, giving the controller 300 ms, the total budget the vendor driver allows. Boards without a reset line keep the old timing. Usually phones such as Pixel 4a and Xiaomi Mi 8 needs longer delay, so without this change touchscreen stops working. Fixes: 8a1f9de80e45 ("Input: stmfts - add optional reset GPIO support") Cc: stable@vger.kernel.org Signed-off-by: David Heidelberg --- drivers/input/touchscreen/stmfts.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen= /stmfts.c index 972687797f826..711e3ad8587a0 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -59,16 +59,18 @@ #define STMFTS_MASK_X_MSB 0x0f #define STMFTS_MASK_Y_LSB 0xf0 =20 /* key related event masks */ #define STMFTS_MASK_KEY_NO_TOUCH 0x00 #define STMFTS_MASK_KEY_MENU 0x01 #define STMFTS_MASK_KEY_BACK 0x02 =20 +#define STMFTS_RESET_TIMEOUT_MS 300 + #define STMFTS_EVENT_SIZE 8 #define STMFTS_STACK_DEPTH 32 #define STMFTS_DATA_MAX_SIZE (STMFTS_EVENT_SIZE * STMFTS_STACK_DEPTH) #define STMFTS_MAX_FINGERS 10 #define STMFTS_DEV_NAME "stmfts" =20 static const struct regulator_bulk_data stmfts_supplies[] =3D { { .supply =3D "vdd" }, @@ -538,23 +540,30 @@ static int stmfts_read_system_info(struct stmfts_data= *sdata) sdata->chip_ver =3D reg[0]; sdata->fw_ver =3D be16_to_cpup((__be16 *)®[2]); sdata->config_id =3D reg[4]; sdata->config_ver =3D reg[5]; =20 return 0; } =20 -static void stmfts_reset(struct stmfts_data *sdata) +static int stmfts_reset(struct stmfts_data *sdata) { gpiod_set_value_cansleep(sdata->reset_gpio, 1); msleep(20); =20 + reinit_completion(&sdata->cmd_done); gpiod_set_value_cansleep(sdata->reset_gpio, 0); - msleep(50); + enable_irq(sdata->client->irq); + + if (!wait_for_completion_timeout(&sdata->cmd_done, + msecs_to_jiffies(STMFTS_RESET_TIMEOUT_MS))) + return -ETIMEDOUT; + + return 0; } =20 static int stmfts_configure(struct stmfts_data *sdata) { int err; =20 err =3D stmfts_command(sdata, STMFTS_SYSTEM_RESET); if (err) @@ -593,42 +602,47 @@ static int stmfts_power_on(struct stmfts_data *sdata) return err; =20 /* * The datasheet does not specify the power on time, but considering * that the reset time is < 10ms, I sleep 20ms to be sure */ msleep(20); =20 - if (sdata->reset_gpio) - stmfts_reset(sdata); + if (sdata->reset_gpio) { + err =3D stmfts_reset(sdata); + if (err) { + dev_err(&sdata->client->dev, + "controller not ready after reset: %d\n", err); + goto err_disable_irq; + } + } else { + enable_irq(sdata->client->irq); + msleep(50); + } =20 err =3D stmfts_read_system_info(sdata); if (err) - goto err_disable_regulators; - - enable_irq(sdata->client->irq); - - msleep(50); + goto err_disable_irq; =20 err =3D stmfts_configure(sdata); if (err) goto err_disable_irq; =20 /* * At this point no one is using the touchscreen * and I don't really care about the return value */ (void)i2c_smbus_write_byte(sdata->client, STMFTS_SLEEP_IN); =20 return 0; =20 err_disable_irq: disable_irq(sdata->client->irq); -err_disable_regulators: + regulator_bulk_disable(ARRAY_SIZE(stmfts_supplies), sdata->supplies); return err; } =20 static void stmfts_power_off(void *data) { struct stmfts_data *sdata =3D data; =20 --=20 2.55.0 From nobody Fri Sep 25 23:54:11 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A4B435E953; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; cv=none; b=KKz44q4llK9tVR8qBzXkfYvjM2AqNZLvDKB+mc0vhV3k1dSLmKT3SFEnGxBi7F4LKHoQ++qy9cZd93yyTQwZ31ww7/GI0EfF8vj5jKPU83j/hxToKMAQHMEUe9JK0qwBIjrn0Tn4M7H0Tcdh8RQLvIjO6PLvvP4hV6tRYw6ff9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; c=relaxed/simple; bh=NnOq+xRUSpOQqEwshprztuziPWpVBsyCAlS5zdxPx2U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F+BuWYD/3PVEkMksmRNYP4z71XjX8t6voQ9NnBnq8rfFNnf+yMp8ho29MA6pYEaD66l4IPPeQESDczFKDlq6nYWhu/3C/D1tdAl0+8giYnP027mqfjGRvBbPe1wYvsqUeVzEuItZPI+yBG1wSxzai0I7a4BsMaXDzK7BLQifLns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q0lWlN25; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q0lWlN25" Received: by smtp.kernel.org (Postfix) with ESMTPS id 18924C2BCFA; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788778227; bh=NnOq+xRUSpOQqEwshprztuziPWpVBsyCAlS5zdxPx2U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Q0lWlN25ZhfX7WjJBTu0Eeo4wcbF8hmc0CwooVuNdMcTMYkgyytCNX3VVQlfTog6a K0X6NRMPg5I0ztsoZAfkHnIAoUbPBtHlIlMtegg3v7CAMEdCI9fgI5VGH3dVwlbF7D iO5+kgOkFqbqT5KgfzxbHNhRDnsnp3hDLtoRjxbJTsGRTrBMzE171oVzv72bjnMs9q 5dw1vkjBpAiJBzRCWSbZMSWenS9YCDntB+2UP+yy38NPk1uZxtuifZDy2hXMmed89Q pOERTNvEenGnjziD83gmnIuasfgUGpAfbXdnB4yJJB5q4ZwF5IiJ0hhOUAZZpkYOYF FQ7grFkOGeevg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECCC5C79F9F; Mon, 7 Sep 2026 10:50:26 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Mon, 07 Sep 2026 12:50:20 +0200 Subject: [PATCH v7 2/4] dt-bindings: input: touchscreen: st,stmfts: Introduce STM FTS5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260907-stmfts5-v7-2-4a53381cd038@ixit.cz> References: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> In-Reply-To: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> To: Dmitry Torokhov , Maxime Coquelin , Alexandre Torgue , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg , Bjorn Andersson , Konrad Dybcio Cc: Petr Hodina , linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, phone-devel@vger.kernel.org, David Heidelberg X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2705; i=david@ixit.cz; h=from:subject:message-id; bh=pbzOh5CHeD/4F3W1fha7bB0ZUX+yDlqPPUvexzr6fCU=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBqnpbwm/VbbsTyNpKmRD0XVO0hSRIGBkkoEdqGS hx0/PrIhyeJAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCap6W8AAKCRBgAj/E00kg cqZkD/46SiFUpC0wzVRBwi3o7XmkKwjoNM/e0Pl71MYXsT7Sz4KcjSbWInFdzVuB+qStCyArjCV 2xbcuQdJryEGmwvjFKeHLzFoNGypjI3osWN5wRYW4aUom3XYkIb4MnIoaQhowm6dYwH8nj+2cKv z1HIN4SAYpyjt8ljJfrBwxeJMm28Z7dzS5y3ugKgEhmvvoZnr3dBw+yE7w3EVVD1UTS3ZwMdZhY oFlEJHakJRHle4t+J6j49vyq2hSsy5cwxG7Lgc8hAY4I8eetgxJabttoYbUIC5RyeiuDRYOF5Xo g+E/OJ3pmRpTPwpHznj4JJSZZQ9UAu+hFHl1aH+J/K2AyUOVvL5uyuMuXy5zWqhCEfKOeEa3auZ uihV7fEUCkw/89syR3Rr6FAbtpVnp/J7Rn7jsd5c/PiWdQkkKi+TKCUgiFVdbTGiPdjxnoEBzIF IdZwAmi2F7eG2uucMbt+NQ4ZpP3hMvJ5h5oC3dRQoQabI/53Ml7d0h+88d5BVSmDRtQldKEPlRs O8F/tKzQvgY6XM5Gb6WEeu8HOa72GCEDfskDpjz3CxYpJLFv17l1mvepwnHGz5f/3+uLzr1ejKW yeSp2mhPOoXaRWD2kaOc/yAOgksbYS9FTgtj6C7tOKZnLocwhZKw//JtHftNDWmQy0mQGzI/caO SpXMCX2OvSVl9cw== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz From: David Heidelberg Introduce more recent STM FTS5 touchscreen support. Signed-off-by: David Heidelberg --- .../bindings/input/touchscreen/st,stmfts.yaml | 29 ++++++++++++++++--= ---- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/input/touchscreen/st,stmfts.= yaml b/Documentation/devicetree/bindings/input/touchscreen/st,stmfts.yaml index 64c4f24ea3dd0..3de4bc5cd3f78 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/st,stmfts.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/st,stmfts.yaml @@ -9,22 +9,21 @@ title: ST-Microelectronics FingerTip touchscreen controll= er maintainers: - Krzysztof Kozlowski =20 description: The ST-Microelectronics FingerTip device provides a basic touchscreen functionality. Along with it the user can enable the touchkey which can = work as a basic HOME and BACK key for phones. =20 -allOf: - - $ref: touchscreen.yaml# - properties: compatible: - const: st,stmfts + enum: + - st,stmfts + - st,stmfts5 =20 reg: maxItems: 1 =20 avdd-supply: description: Analogic power supply =20 interrupts: @@ -35,42 +34,56 @@ properties: =20 touch-key-connected: type: boolean description: The touchkey feature is connected =20 vdd-supply: description: Power supply =20 + mode-switch-gpios: + description: Optional switch between touchscreen SLPI and AP mode. + maxItems: 1 + reset-gpios: description: Reset GPIO (active-low) maxItems: 1 =20 required: - compatible - reg - avdd-supply - interrupts - vdd-supply =20 +allOf: + - $ref: touchscreen.yaml# + - if: + not: + properties: + compatible: + const: st,stmfts5 + then: + properties: + mode-switch-gpios: false + unevaluatedProperties: false =20 examples: - | #include =20 i2c { #address-cells =3D <1>; #size-cells =3D <0>; =20 touchscreen@49 { compatible =3D "st,stmfts"; reg =3D <0x49>; - interrupt-parent =3D <&gpa1>; - interrupts =3D <1 IRQ_TYPE_LEVEL_LOW>; - touchscreen-size-x =3D <1599>; - touchscreen-size-y =3D <2559>; + interrupts-extended =3D <&gpa1 1 IRQ_TYPE_LEVEL_LOW>; + touchscreen-size-x =3D <1600>; + touchscreen-size-y =3D <2560>; touch-key-connected; avdd-supply =3D <&ldo30_reg>; vdd-supply =3D <&ldo31_reg>; ledvdd-supply =3D <&ldo33_reg>; }; }; --=20 2.55.0 From nobody Fri Sep 25 23:54:11 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A40F34F49F; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; cv=none; b=XAMMdHggLVT7XMBg1VppSf51HnvwyiWRtNEshSkN7fhJK7XHgJzcMwKhQiZnL4FHmK/ZRqAsmshHclVTPd0Isu/GjGWVLaFjRGk17C1Tmm1WBpAM3tMjLrddHDKUWKIAioMgsTjvXCd2o8DXKPMmGjQ7HmFP3aS2Fg45E7ddN3E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; c=relaxed/simple; bh=LA6UnZSp495zEmIpavaDWIhazjyJbj4A5UfVgamsR/I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nzEfFRRzKavjBZa+87L7gB9gt/sP9Hf38uOkNTyPIXBKy2NHIWpyFR+gH4E8/10oNlqRZWApok9cKJKmzBIRRLfEIhk4ykptlWQHgiIM2kofniCTEn6RvykH0RuB9TtN38KpMlxRV3uegGbMa4Ti5+VCuV6o+RtrAs/MOJoHCnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K+IxrLfb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K+IxrLfb" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2D47FC2BCFD; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788778227; bh=LA6UnZSp495zEmIpavaDWIhazjyJbj4A5UfVgamsR/I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=K+IxrLfb63ceNlq8eCQGi/KunpLr0vJl+P+FPgj/43FFz71Y9/fijIeYajGDtBjeV /EJlwk37L/k+MW+97/Jfa6n8UPFvXPn2VZqfVTqxuZJuuTkWEHx9SB7NFVYGZu86ex r/+UOhL890oJ/l6CSEO0KhWqEfwFFVu3BspRHiVxpGiz0Vbu9DK4ti5VDEyiscXj3X BABuPLcNoyi5cgPd0pbiM7LbGxvWeiZIn9Kx/HUSIM31Y3QSZwwEBpWF/Cc7QQcnxC NqAM4wjQHXfhOeoPOp/dcMdWs3NGAgHxS+OHTVKGrbzPmCEbeOh/xUzFvkom4VXU/T WxmUQrdN2/ybw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DC60C79F89; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Mon, 07 Sep 2026 12:50:21 +0200 Subject: [PATCH v7 3/4] Input: stmfts - support FTS5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260907-stmfts5-v7-3-4a53381cd038@ixit.cz> References: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> In-Reply-To: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> To: Dmitry Torokhov , Maxime Coquelin , Alexandre Torgue , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg , Bjorn Andersson , Konrad Dybcio Cc: Petr Hodina , linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, phone-devel@vger.kernel.org, David Heidelberg X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=24144; i=david@ixit.cz; h=from:subject:message-id; bh=Nty/mP/2SEC4p1qFPT8550QB+n1dC742NrruecRIff4=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBqnpbxgt/vdyWQg9DuujT5qf6BiGBGvvvfIiS9e pyIhEVQX42JAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCap6W8QAKCRBgAj/E00kg cjMTD/9JjCnpxQP4vArP6NklPIBvEeQfdUdBEQUzBYCq/oYrjvKr4phveGkjsyUZPYArpE4bf7w CsZ65UPp14AlJ8bJRpCq8zcsJlAeIQsoiZBINkM5zw/rKYAV+PJPthJUQb6zIxtnUjyx1xODxLq I8MkN5DnglMJ+Cw1YSwnjYPsLEsehO5/uufrfUovy4zcDH6qj4+AEuJHMp0hwtU8kCU6bUmg4TV J75lMSpJQ0NP8iW+ZiUrfVnV+pWC7K/ENwa0iGaWEQuy0GSeHqjfRp2dL5lISBQKLN2U0LJ/pqR smn2Qwll43FaOGCMw80Oz4ojIJN3fDkW7X4rL8luNKTHdKtcP+0ULQqJrC/GgEfIGjqBTJaKkwk 0vN4asRWzOUvHIv5UUnD87+hFBDch46Bk1d4e5F4f9PeKLsOJ8TtoVBbaNasGj/Ud0fYiPKm7j6 OxivLrjYHrdTdkLyfbO3hvj8R8LJ8rrlkMO1bdGILPGgfJD30d/F48VCayBl+Rg+bJ4jq9HZV7Y sCUDZr5cZSTbJwFZRxOxfag4VDxT9YZW3vi7gC7tl2mifsYq+Jw3NK4LTcu2z7NmhBNNzeqTFH5 KObkuSY+o6Cdi4zB/clH8goMbEsxyq1DoL4dWqgGwqN7SWTSwsNHNo3l0LMaL/W5VLIybIewDZA CKFE2rcUkXk4Fxw== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz From: David Heidelberg FTS support SLPI and AP mode, introduce mode-switch GPIO to switch between those two. Currently we can handle only full power AP mode, so we just keep the AP on. Useful for devices like Pixel 3 (blueline), Pixel 4a (sunfish), Xiaomi Mi 8 (dipper), and many others. Based on work of Petr Hodina Signed-off-by: David Heidelberg --- drivers/input/touchscreen/stmfts.c | 406 +++++++++++++++++++++++++++++++++= ---- 1 file changed, 366 insertions(+), 40 deletions(-) diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen= /stmfts.c index 711e3ad8587a0..99fc9840d3685 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -1,14 +1,18 @@ // SPDX-License-Identifier: GPL-2.0 -// STMicroelectronics FTS Touchscreen device driver -// -// Copyright (c) 2017 Samsung Electronics Co., Ltd. -// Copyright (c) 2017 Andi Shyti +/* STMicroelectronics FTS Touchscreen device driver + * + * Copyright 2017 Samsung Electronics Co., Ltd. + * Copyright 2017 Andi Shyti + * Copyright David Heidelberg + * Copyright Petr Hodina + */ =20 +#include #include #include #include #include #include #include #include #include @@ -30,16 +34,21 @@ #define STMFTS_SS_HOVER_SENSE_ON 0x95 #define STMFTS_MS_KEY_SENSE_OFF 0x9a #define STMFTS_MS_KEY_SENSE_ON 0x9b #define STMFTS_SYSTEM_RESET 0xa0 #define STMFTS_CLEAR_EVENT_STACK 0xa1 #define STMFTS_FULL_FORCE_CALIBRATION 0xa2 #define STMFTS_MS_CX_TUNING 0xa3 #define STMFTS_SS_CX_TUNING 0xa4 +#define STMFTS5_SET_SCAN_MODE 0xa0 + +/* FTS5 scan mode commands */ +#define STMFTS5_SCAN_MODE_ACTIVE 0x00 +#define STMFTS5_SCAN_ACTIVE_MULTI_TOUCH BIT(0) =20 /* events */ #define STMFTS_EV_NO_EVENT 0x00 #define STMFTS_EV_MULTI_TOUCH_DETECTED 0x02 #define STMFTS_EV_MULTI_TOUCH_ENTER 0x03 #define STMFTS_EV_MULTI_TOUCH_LEAVE 0x04 #define STMFTS_EV_MULTI_TOUCH_MOTION 0x05 #define STMFTS_EV_HOVER_ENTER 0x07 @@ -47,22 +56,48 @@ #define STMFTS_EV_HOVER_MOTION 0x09 #define STMFTS_EV_KEY_STATUS 0x0e #define STMFTS_EV_ERROR 0x0f #define STMFTS_EV_CONTROLLER_READY 0x10 #define STMFTS_EV_SLEEP_OUT_CONTROLLER_READY 0x11 #define STMFTS_EV_STATUS 0x16 #define STMFTS_EV_DEBUG 0xdb =20 +/* + * FTS5 events: the event ID is in the high nibble of event[0], the low + * nibble carries additional payload (bits 5:4 of the touch major axis for + * touch events), so it must be masked before comparing. + */ +#define STMFTS5_EV_CONTROLLER_READY 0x03 +#define STMFTS5_EV_MULTI_TOUCH_ENTER 0x10 +#define STMFTS5_EV_MULTI_TOUCH_MOTION 0x20 +#define STMFTS5_EV_MULTI_TOUCH_LEAVE 0x30 +#define STMFTS5_EV_STATUS_UPDATE 0x40 +#define STMFTS5_EV_USER_REPORT 0x50 +#define STMFTS5_EV_DEBUG 0xe0 +#define STMFTS5_EV_ERROR 0xf0 + /* multi touch related event masks */ #define STMFTS_MASK_EVENT_ID 0x0f #define STMFTS_MASK_TOUCH_ID 0xf0 #define STMFTS_MASK_LEFT_EVENT 0x0f #define STMFTS_MASK_X_MSB 0x0f #define STMFTS_MASK_Y_LSB 0xf0 +#define STMFTS5_MASK_EVENT_ID 0xf0 +#define STMFTS5_MASK_TOUCH_TYPE 0x0f +#define STMFTS5_MASK_MAJOR_MSB 0x0c +#define STMFTS5_MASK_MINOR_MSB 0xc0 + +/* touch type classifications */ +#define STMFTS_TOUCH_TYPE_INVALID 0x00 +#define STMFTS_TOUCH_TYPE_FINGER 0x01 +#define STMFTS_TOUCH_TYPE_GLOVE 0x02 +#define STMFTS_TOUCH_TYPE_STYLUS 0x03 +#define STMFTS_TOUCH_TYPE_PALM 0x04 +#define STMFTS_TOUCH_TYPE_HOVER 0x05 =20 /* key related event masks */ #define STMFTS_MASK_KEY_NO_TOUCH 0x00 #define STMFTS_MASK_KEY_MENU 0x01 #define STMFTS_MASK_KEY_BACK 0x02 =20 #define STMFTS_RESET_TIMEOUT_MS 300 =20 @@ -73,19 +108,22 @@ #define STMFTS_DEV_NAME "stmfts" =20 static const struct regulator_bulk_data stmfts_supplies[] =3D { { .supply =3D "vdd" }, { .supply =3D "avdd" }, }; =20 struct stmfts_data { + const struct stmfts_chip_ops *ops; + struct i2c_client *client; struct input_dev *input; struct gpio_desc *reset_gpio; + struct gpio_desc *mode_switch_gpio; struct led_classdev led_cdev; struct mutex mutex; =20 struct touchscreen_properties prop; =20 struct regulator_bulk_data *supplies; =20 /* @@ -102,19 +140,29 @@ struct stmfts_data { =20 u8 data[STMFTS_DATA_MAX_SIZE]; =20 struct completion cmd_done; =20 bool use_key; bool led_status; bool hover_enabled; + bool stylus_enabled; bool running; }; =20 +struct stmfts_chip_ops { + int (*configure)(struct stmfts_data *sdata); + int (*setup_input)(struct stmfts_data *sdata); + void (*parse_events)(struct stmfts_data *sdata); + int (*set_scan)(struct stmfts_data *sdata, bool enable); + int (*set_hover)(struct stmfts_data *sdata, bool enable); + int (*runtime_resume)(struct stmfts_data *sdata); +}; + static int stmfts_brightness_set(struct led_classdev *led_cdev, enum led_brightness value) { struct stmfts_data *sdata =3D container_of(led_cdev, struct stmfts_data, led_cdev); int err; =20 if (value !=3D sdata->led_status && sdata->ledvdd) { @@ -167,16 +215,17 @@ static int stmfts_read_events(struct stmfts_data *sda= ta) =20 ret =3D i2c_transfer(sdata->client->adapter, msgs, ARRAY_SIZE(msgs)); if (ret < 0) return ret; =20 return ret =3D=3D ARRAY_SIZE(msgs) ? 0 : -EIO; } =20 +/* FTS4 event handling functions */ static void stmfts_report_contact_event(struct stmfts_data *sdata, const u8 event[]) { u8 slot_id =3D (event[0] & STMFTS_MASK_TOUCH_ID) >> 4; u16 x =3D event[1] | ((event[2] & STMFTS_MASK_X_MSB) << 8); u16 y =3D (event[2] >> 4) | (event[3] << 4); u8 maj =3D event[4]; u8 min =3D event[5]; @@ -202,16 +251,107 @@ static void stmfts_report_contact_release(struct stm= fts_data *sdata, u8 slot_id =3D (event[0] & STMFTS_MASK_TOUCH_ID) >> 4; =20 input_mt_slot(sdata->input, slot_id); input_mt_report_slot_inactive(sdata->input); =20 input_sync(sdata->input); } =20 +/* FTS5 event handling functions */ +static void stmfts5_report_contact_event(struct stmfts_data *sdata, + const u8 event[]) +{ + /* + * FTS5 touch event format: + * event[0] =3D event ID (high nibble) | major bits 5:4 (bits 3:2) + * event[1] =3D touch ID (high nibble) | touch type (low nibble) + * event[2] =3D X bits 7:0 + * event[3] =3D Y bits 3:0 (high nibble) | X bits 11:8 (low nibble) + * event[4] =3D Y bits 11:4 + * event[5] =3D pressure + * event[6] =3D major bits 3:0 (high nibble) | minor bits 3:0 (low nibble) + * event[7] =3D minor bits 5:4 (bits 7:6) + */ + u8 touch_id =3D (event[1] & STMFTS_MASK_TOUCH_ID) >> 4; + u8 touch_type =3D event[1] & STMFTS5_MASK_TOUCH_TYPE; + u16 x =3D ((event[3] & STMFTS_MASK_X_MSB) << 8) | event[2]; + u16 y =3D (event[4] << 4) | ((event[3] & STMFTS_MASK_Y_LSB) >> 4); + u8 area =3D event[5]; + u8 maj =3D ((event[0] & STMFTS5_MASK_MAJOR_MSB) << 2) | (event[6] >> 4); + u8 min =3D ((event[7] & STMFTS5_MASK_MINOR_MSB) >> 2) | (event[6] & 0x0f); + /* Distance is 0 for touching, max for hovering */ + int distance =3D 0; + unsigned int tool; + + switch (touch_type) { + case STMFTS_TOUCH_TYPE_STYLUS: + if (sdata->stylus_enabled) { + tool =3D MT_TOOL_PEN; + break; + } + fallthrough; /* Report as finger if stylus not enabled */ + + case STMFTS_TOUCH_TYPE_FINGER: + case STMFTS_TOUCH_TYPE_GLOVE: + tool =3D MT_TOOL_FINGER; + break; + + case STMFTS_TOUCH_TYPE_PALM: + /* Palm touch - report but can be filtered by userspace */ + tool =3D MT_TOOL_PALM; + break; + + case STMFTS_TOUCH_TYPE_HOVER: + tool =3D MT_TOOL_FINGER; + distance =3D 255; + break; + + case STMFTS_TOUCH_TYPE_INVALID: + default: + dev_warn(&sdata->client->dev, + "invalid touch type %d for slot %d\n", + touch_type, touch_id); + return; + } + + if (touch_type =3D=3D STMFTS_TOUCH_TYPE_HOVER) { + area =3D 0; + } else if (!area) { + /* + * Should not happen for contact events. Set minimum pressure + * to prevent touch from being dropped. + */ + dev_warn_once(&sdata->client->dev, + "zero pressure on contact event, slot %d\n", + touch_id); + area =3D 1; + } + + input_mt_slot(sdata->input, touch_id); + input_mt_report_slot_state(sdata->input, tool, true); + + input_report_abs(sdata->input, ABS_MT_POSITION_X, x); + input_report_abs(sdata->input, ABS_MT_POSITION_Y, y); + input_report_abs(sdata->input, ABS_MT_TOUCH_MAJOR, maj); + input_report_abs(sdata->input, ABS_MT_TOUCH_MINOR, min); + input_report_abs(sdata->input, ABS_MT_PRESSURE, area); + input_report_abs(sdata->input, ABS_MT_DISTANCE, distance); +} + +static void stmfts5_report_contact_release(struct stmfts_data *sdata, + const u8 event[]) +{ + /* FTM5 format: touch ID is in high 4 bits of event[1] */ + u8 touch_id =3D (event[1] & STMFTS_MASK_TOUCH_ID) >> 4; + + input_mt_slot(sdata->input, touch_id); + input_mt_report_slot_inactive(sdata->input); +} + static void stmfts_report_hover_event(struct stmfts_data *sdata, const u8 event[]) { u16 x =3D (event[2] << 4) | (event[4] >> 4); u16 y =3D (event[3] << 4) | (event[4] & STMFTS_MASK_Y_LSB); u8 z =3D event[5]; =20 input_report_abs(sdata->input, ABS_X, x); @@ -294,29 +434,76 @@ static void stmfts_parse_events(struct stmfts_data *s= data) =20 default: dev_err(&sdata->client->dev, "unknown event %#02x\n", event[0]); } } } =20 +static void stmfts5_parse_events(struct stmfts_data *sdata) +{ + for (int i =3D 0; i < STMFTS_STACK_DEPTH; i++) { + u8 *event =3D &sdata->data[i * STMFTS_EVENT_SIZE]; + + switch (event[0]) { + case STMFTS5_EV_CONTROLLER_READY: + complete(&sdata->cmd_done); + fallthrough; + + case STMFTS_EV_NO_EVENT: + goto sync; + } + + switch (event[0] & STMFTS5_MASK_EVENT_ID) { + case STMFTS5_EV_STATUS_UPDATE: + case STMFTS5_EV_USER_REPORT: + case STMFTS5_EV_DEBUG: + goto sync; + + case STMFTS5_EV_MULTI_TOUCH_ENTER: + case STMFTS5_EV_MULTI_TOUCH_MOTION: + stmfts5_report_contact_event(sdata, event); + break; + + case STMFTS5_EV_MULTI_TOUCH_LEAVE: + stmfts5_report_contact_release(sdata, event); + break; + + case STMFTS5_EV_ERROR: + dev_warn(&sdata->client->dev, + "error code: 0x%x%x%x%x%x%x", + event[6], event[5], event[4], + event[3], event[2], event[1]); + break; + + default: + dev_err(&sdata->client->dev, + "unknown FTS5 event %#02x\n", event[0]); + } + } + +sync: + input_mt_sync_frame(sdata->input); + input_sync(sdata->input); +} + static irqreturn_t stmfts_irq_handler(int irq, void *dev) { struct stmfts_data *sdata =3D dev; int err; =20 guard(mutex)(&sdata->mutex); =20 err =3D stmfts_read_events(sdata); if (unlikely(err)) dev_err(&sdata->client->dev, "failed to read events: %d\n", err); else - stmfts_parse_events(sdata); + sdata->ops->parse_events(sdata); =20 return IRQ_HANDLED; } =20 static int stmfts_command(struct stmfts_data *sdata, const u8 cmd) { int err; =20 @@ -328,37 +515,64 @@ static int stmfts_command(struct stmfts_data *sdata, = const u8 cmd) =20 if (!wait_for_completion_timeout(&sdata->cmd_done, msecs_to_jiffies(1000))) return -ETIMEDOUT; =20 return 0; } =20 +static int stmfts_set_scan(struct stmfts_data *sdata, bool enable) +{ + return i2c_smbus_write_byte(sdata->client, + enable ? STMFTS_MS_MT_SENSE_ON : + STMFTS_MS_MT_SENSE_OFF); +} + +static int stmfts_set_hover(struct stmfts_data *sdata, bool enable) +{ + return i2c_smbus_write_byte(sdata->client, + enable ? STMFTS_SS_HOVER_SENSE_ON : + STMFTS_SS_HOVER_SENSE_OFF); +} + +static int stmfts5_set_scan(struct stmfts_data *sdata, bool enable) +{ + u8 scan_mode_cmd[3] =3D { STMFTS5_SET_SCAN_MODE, STMFTS5_SCAN_MODE_ACTIVE, + enable ? STMFTS5_SCAN_ACTIVE_MULTI_TOUCH : 0 }; + int err; + + err =3D i2c_master_send(sdata->client, scan_mode_cmd, + sizeof(scan_mode_cmd)); + if (err !=3D sizeof(scan_mode_cmd)) + return err < 0 ? err : -EIO; + + return 0; +} + static int stmfts_input_open(struct input_dev *dev) { struct stmfts_data *sdata =3D input_get_drvdata(dev); int err; =20 err =3D pm_runtime_resume_and_get(&sdata->client->dev); if (err) return err; =20 - err =3D i2c_smbus_write_byte(sdata->client, STMFTS_MS_MT_SENSE_ON); + err =3D sdata->ops->set_scan(sdata, true); if (err) { pm_runtime_put_sync(&sdata->client->dev); return err; } =20 scoped_guard(mutex, &sdata->mutex) { sdata->running =3D true; =20 - if (sdata->hover_enabled) { - err =3D i2c_smbus_write_byte(sdata->client, - STMFTS_SS_HOVER_SENSE_ON); + if (sdata->hover_enabled && sdata->ops->set_hover) { + err =3D sdata->ops->set_hover(sdata, true); if (err) dev_warn(&sdata->client->dev, "failed to enable hover\n"); } } =20 if (sdata->use_key) { err =3D i2c_smbus_write_byte(sdata->client, @@ -372,27 +586,26 @@ static int stmfts_input_open(struct input_dev *dev) return 0; } =20 static void stmfts_input_close(struct input_dev *dev) { struct stmfts_data *sdata =3D input_get_drvdata(dev); int err; =20 - err =3D i2c_smbus_write_byte(sdata->client, STMFTS_MS_MT_SENSE_OFF); + err =3D sdata->ops->set_scan(sdata, false); if (err) dev_warn(&sdata->client->dev, "failed to disable touchscreen: %d\n", err); =20 scoped_guard(mutex, &sdata->mutex) { sdata->running =3D false; =20 - if (sdata->hover_enabled) { - err =3D i2c_smbus_write_byte(sdata->client, - STMFTS_SS_HOVER_SENSE_OFF); + if (sdata->hover_enabled && sdata->ops->set_hover) { + err =3D sdata->ops->set_hover(sdata, false); if (err) dev_warn(&sdata->client->dev, "failed to disable hover: %d\n", err); } } =20 if (sdata->use_key) { err =3D i2c_smbus_write_byte(sdata->client, @@ -484,20 +697,18 @@ static ssize_t stmfts_sysfs_hover_enable_write(struct= device *dev, if (kstrtoul(buf, 0, &value)) return -EINVAL; =20 hover =3D !!value; =20 guard(mutex)(&sdata->mutex); =20 if (hover !=3D sdata->hover_enabled) { - if (sdata->running) { - err =3D i2c_smbus_write_byte(sdata->client, - value ? STMFTS_SS_HOVER_SENSE_ON : - STMFTS_SS_HOVER_SENSE_OFF); + if (sdata->running && sdata->ops->set_hover) { + err =3D sdata->ops->set_hover(sdata, hover); if (err) return err; } =20 sdata->hover_enabled =3D hover; } =20 return len; @@ -560,16 +771,20 @@ static int stmfts_reset(struct stmfts_data *sdata) =20 return 0; } =20 static int stmfts_configure(struct stmfts_data *sdata) { int err; =20 + err =3D stmfts_read_system_info(sdata); + if (err) + return err; + err =3D stmfts_command(sdata, STMFTS_SYSTEM_RESET); if (err) return err; =20 err =3D stmfts_command(sdata, STMFTS_SLEEP_OUT); if (err) return err; =20 @@ -614,21 +829,17 @@ static int stmfts_power_on(struct stmfts_data *sdata) "controller not ready after reset: %d\n", err); goto err_disable_irq; } } else { enable_irq(sdata->client->irq); msleep(50); } =20 - err =3D stmfts_read_system_info(sdata); - if (err) - goto err_disable_irq; - - err =3D stmfts_configure(sdata); + err =3D sdata->ops->configure(sdata); if (err) goto err_disable_irq; =20 /* * At this point no one is using the touchscreen * and I don't really care about the return value */ (void)i2c_smbus_write_byte(sdata->client, STMFTS_SLEEP_IN); @@ -637,28 +848,85 @@ static int stmfts_power_on(struct stmfts_data *sdata) =20 err_disable_irq: disable_irq(sdata->client->irq); =20 regulator_bulk_disable(ARRAY_SIZE(stmfts_supplies), sdata->supplies); return err; } =20 +static int stmfts5_configure(struct stmfts_data *sdata) +{ + u8 event[STMFTS_EVENT_SIZE]; + int err; + + /* Verify I2C communication */ + err =3D i2c_smbus_read_i2c_block_data(sdata->client, + STMFTS_READ_ALL_EVENT, + sizeof(event), event); + if (err < 0) + return err; + + return 0; +} + static void stmfts_power_off(void *data) { struct stmfts_data *sdata =3D data; =20 disable_irq(sdata->client->irq); =20 if (sdata->reset_gpio) gpiod_set_value_cansleep(sdata->reset_gpio, 1); =20 regulator_bulk_disable(ARRAY_SIZE(stmfts_supplies), sdata->supplies); } =20 +static int stmfts_setup_input(struct stmfts_data *sdata) +{ + struct device *dev =3D &sdata->client->dev; + + input_set_abs_params(sdata->input, ABS_MT_ORIENTATION, 0, 255, 0, 0); + input_set_abs_params(sdata->input, ABS_DISTANCE, 0, 255, 0, 0); + + sdata->use_key =3D device_property_read_bool(dev, "touch-key-connected"); + if (sdata->use_key) { + input_set_capability(sdata->input, EV_KEY, KEY_MENU); + input_set_capability(sdata->input, EV_KEY, KEY_BACK); + } + + return input_mt_init_slots(sdata->input, STMFTS_MAX_FINGERS, + INPUT_MT_DIRECT); +} + +static int stmfts5_setup_input(struct stmfts_data *sdata) +{ + struct device *dev =3D &sdata->client->dev; + + sdata->mode_switch_gpio =3D devm_gpiod_get_optional(dev, "mode-switch", + GPIOD_OUT_HIGH); + if (IS_ERR(sdata->mode_switch_gpio)) + return dev_err_probe(dev, PTR_ERR(sdata->mode_switch_gpio), + "Failed to get GPIO 'switch'\n"); + + /* Set resolution for accurate calibration */ + if (!input_abs_get_res(sdata->input, ABS_MT_POSITION_X)) { + input_abs_set_res(sdata->input, ABS_MT_POSITION_X, 10); + input_abs_set_res(sdata->input, ABS_MT_POSITION_Y, 10); + } + + input_set_abs_params(sdata->input, ABS_MT_DISTANCE, 0, 255, 0, 0); + + /* Enable stylus support if requested */ + sdata->stylus_enabled =3D device_property_read_bool(dev, "stylus-enabled"= ); + + return input_mt_init_slots(sdata->input, STMFTS_MAX_FINGERS, + INPUT_MT_DIRECT); +} + static int stmfts_enable_led(struct stmfts_data *sdata) { int err; =20 /* get the regulator for powering the leds on */ sdata->ledvdd =3D devm_regulator_get(&sdata->client->dev, "ledvdd"); if (IS_ERR(sdata->ledvdd)) return PTR_ERR(sdata->ledvdd); @@ -694,16 +962,18 @@ static int stmfts_probe(struct i2c_client *client) return -ENOMEM; =20 i2c_set_clientdata(client, sdata); =20 sdata->client =3D client; mutex_init(&sdata->mutex); init_completion(&sdata->cmd_done); =20 + sdata->ops =3D i2c_get_match_data(client); + err =3D devm_regulator_bulk_get_const(dev, ARRAY_SIZE(stmfts_supplies), stmfts_supplies, &sdata->supplies); if (err) return err; =20 sdata->reset_gpio =3D devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIG= H); @@ -721,28 +991,19 @@ static int stmfts_probe(struct i2c_client *client) sdata->input->close =3D stmfts_input_close; =20 input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_X); input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_Y); touchscreen_parse_properties(sdata->input, true, &sdata->prop); =20 input_set_abs_params(sdata->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0); input_set_abs_params(sdata->input, ABS_MT_TOUCH_MINOR, 0, 255, 0, 0); - input_set_abs_params(sdata->input, ABS_MT_ORIENTATION, 0, 255, 0, 0); input_set_abs_params(sdata->input, ABS_MT_PRESSURE, 0, 255, 0, 0); - input_set_abs_params(sdata->input, ABS_DISTANCE, 0, 255, 0, 0); - - sdata->use_key =3D device_property_read_bool(dev, "touch-key-connected"); - if (sdata->use_key) { - input_set_capability(sdata->input, EV_KEY, KEY_MENU); - input_set_capability(sdata->input, EV_KEY, KEY_BACK); - } =20 - err =3D input_mt_init_slots(sdata->input, - STMFTS_MAX_FINGERS, INPUT_MT_DIRECT); + err =3D sdata->ops->setup_input(sdata); if (err) return err; =20 input_set_drvdata(sdata->input, sdata); =20 /* * stmfts_power_on expects interrupt to be disabled, but * at this point the device is still off and I do not trust @@ -803,27 +1064,71 @@ static int stmfts_runtime_suspend(struct device *dev) =20 ret =3D i2c_smbus_write_byte(sdata->client, STMFTS_SLEEP_IN); if (ret) dev_warn(dev, "failed to suspend device: %d\n", ret); =20 return ret; } =20 +static int stmfts_chip_runtime_resume(struct stmfts_data *sdata) +{ + return i2c_smbus_write_byte(sdata->client, STMFTS_SLEEP_OUT); +} + +static int stmfts5_chip_runtime_resume(struct stmfts_data *sdata) +{ + struct i2c_client *client =3D sdata->client; + struct device *dev =3D &client->dev; + u8 int_enable_cmd[4] =3D { 0xB6, 0x00, 0x2C, 0x01 }; + int err; + + err =3D i2c_smbus_write_byte(client, STMFTS_SLEEP_OUT); + if (err) + return err; + + msleep(20); + + /* Perform capacitance tuning after wakeup */ + err =3D i2c_smbus_write_byte(client, STMFTS_MS_CX_TUNING); + if (err) + dev_warn(dev, "MS_CX_TUNING failed: %d\n", err); + msleep(20); + + err =3D i2c_smbus_write_byte(client, STMFTS_SS_CX_TUNING); + if (err) + dev_warn(dev, "SS_CX_TUNING failed: %d\n", err); + msleep(20); + + /* Force calibration */ + err =3D i2c_smbus_write_byte(client, STMFTS_FULL_FORCE_CALIBRATION); + if (err) + dev_warn(dev, "FORCE_CALIBRATION failed: %d\n", err); + msleep(50); + + /* Enable controller interrupts */ + err =3D i2c_master_send(client, int_enable_cmd, sizeof(int_enable_cmd)); + if (err !=3D sizeof(int_enable_cmd)) + return err < 0 ? err : -EIO; + + msleep(20); + + return 0; +} + static int stmfts_runtime_resume(struct device *dev) { struct stmfts_data *sdata =3D dev_get_drvdata(dev); - struct i2c_client *client =3D sdata->client; - int ret; + int err; =20 - ret =3D i2c_smbus_write_byte(client, STMFTS_SLEEP_OUT); - if (ret) - dev_err(dev, "failed to resume device: %d\n", ret); + err =3D sdata->ops->runtime_resume(sdata); + if (err) + dev_err(dev, "failed to resume device: %d\n", err); =20 - return ret; + return err; } =20 static int stmfts_suspend(struct device *dev) { struct stmfts_data *sdata =3D dev_get_drvdata(dev); =20 stmfts_power_off(sdata); =20 @@ -837,26 +1142,45 @@ static int stmfts_resume(struct device *dev) return stmfts_power_on(sdata); } =20 static const struct dev_pm_ops stmfts_pm_ops =3D { SYSTEM_SLEEP_PM_OPS(stmfts_suspend, stmfts_resume) RUNTIME_PM_OPS(stmfts_runtime_suspend, stmfts_runtime_resume, NULL) }; =20 +static const struct stmfts_chip_ops stmfts4_ops =3D { + .configure =3D stmfts_configure, + .setup_input =3D stmfts_setup_input, + .parse_events =3D stmfts_parse_events, + .set_scan =3D stmfts_set_scan, + .set_hover =3D stmfts_set_hover, + .runtime_resume =3D stmfts_chip_runtime_resume, +}; + +static const struct stmfts_chip_ops stmfts5_ops =3D { + .configure =3D stmfts5_configure, + .setup_input =3D stmfts5_setup_input, + .parse_events =3D stmfts5_parse_events, + .set_scan =3D stmfts5_set_scan, + .runtime_resume =3D stmfts5_chip_runtime_resume, +}; + #ifdef CONFIG_OF static const struct of_device_id stmfts_of_match[] =3D { - { .compatible =3D "st,stmfts", }, + { .compatible =3D "st,stmfts", .data =3D &stmfts4_ops }, + { .compatible =3D "st,stmfts5", .data =3D &stmfts5_ops }, { }, }; MODULE_DEVICE_TABLE(of, stmfts_of_match); #endif =20 static const struct i2c_device_id stmfts_id[] =3D { - { .name =3D "stmfts" }, + { .name =3D "stmfts", .driver_data =3D (kernel_ulong_t)&stmfts4_ops }, + { .name =3D "stmfts5", .driver_data =3D (kernel_ulong_t)&stmfts5_ops }, { } }; MODULE_DEVICE_TABLE(i2c, stmfts_id); =20 static struct i2c_driver stmfts_driver =3D { .driver =3D { .name =3D STMFTS_DEV_NAME, .dev_groups =3D stmfts_sysfs_groups, @@ -867,10 +1191,12 @@ static struct i2c_driver stmfts_driver =3D { .probe =3D stmfts_probe, .remove =3D stmfts_remove, .id_table =3D stmfts_id, }; =20 module_i2c_driver(stmfts_driver); =20 MODULE_AUTHOR("Andi Shyti "); +MODULE_AUTHOR("David Heidelberg "); +MODULE_AUTHOR("Petr Hodina "); MODULE_DESCRIPTION("STMicroelectronics FTS Touch Screen"); MODULE_LICENSE("GPL"); --=20 2.55.0 From nobody Fri Sep 25 23:54:11 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A38824679C; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; cv=none; b=g8Tw4+4FxFgBEOB0q1bdzoqv/OUV/fBHLlilb1wdE1pBN8zNe4TYijmVVW4DdAb27Lt+v8RrHZLTKn4drFCYgVqFGz2fPWdrInDZcmpLoQ3DXIcT8fqKB5+ElU7Fshp4rrv4YyFxepz4DhcxBJOkc/3Dpx5tfNBU3Y7HehC0UUQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788778227; c=relaxed/simple; bh=GTKCuKerEVjbEq+ru51jw6Xl/RomTGKgH6W2wG3Nmm8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kL67yxgTAD/GyCL8/2g1hvqZSCjnlSXDlW/Wf0Hk/M9fv2gxcwAYFle/MGecvJJXIDYUUqV1VKNUnleXUdqZ/mZcWSl16Tl6+QmGTW7CNzdcuVtO6++2GqYN69ds6Ne4zC9QQjglAyYnWiMIJYOEYahPLPprEpsNaUVqbAoZXSQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E7eLdch5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E7eLdch5" Received: by smtp.kernel.org (Postfix) with ESMTPS id 39AB6C32781; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788778227; bh=GTKCuKerEVjbEq+ru51jw6Xl/RomTGKgH6W2wG3Nmm8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=E7eLdch5WLY5HM3QuLWloNkUlAlbY2iuXXF+aiOpuPrAYJ9sqT7S9LNjQaiIHAoUF u/3K59vvKNrCczypXm62HLDb+6v82zmskJUaJQfSVHeFYXSNzYn1j+0vK1dkJUwrg3 nHOF6w1mmpN3mZGMzRXyiqlfueFa0kCcEzwVtI7pa4P/DX3uzZXrdE/j4lWkE/y2Bn t+IF3I9cuZqhoZZaL2lgLOUy4P5X1oCsbRsjOV5Bbh+lAAdnpzF0Ww0HMwZAWrF+HO LwA+6rc7YL08lySTQU5pSTnQ0AzlD7eLTKy9ezI9neyKARCajS5+HZzmypBtr9509c 1nQGY8CVnXgdg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21AD1C79FA7; Mon, 7 Sep 2026 10:50:27 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Mon, 07 Sep 2026 12:50:22 +0200 Subject: [PATCH v7 4/4] arm64: dts: qcom: sdm845-google: Add STM FTS touchscreen support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260907-stmfts5-v7-4-4a53381cd038@ixit.cz> References: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> In-Reply-To: <20260907-stmfts5-v7-0-4a53381cd038@ixit.cz> To: Dmitry Torokhov , Maxime Coquelin , Alexandre Torgue , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg , Bjorn Andersson , Konrad Dybcio Cc: Petr Hodina , linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, phone-devel@vger.kernel.org, David Heidelberg , Konrad Dybcio , Dmitry Baryshkov X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2317; i=david@ixit.cz; h=from:subject:message-id; bh=UYybbePhFZQL67dBaI7ZZMSBOFWG/ciE0qllsHbgzEk=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBqnpbxszq1XdEXQk3tbuzwTTUhsGO41uqgWrSI0 z7bZr9gA9GJAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCap6W8QAKCRBgAj/E00kg cj0gD/9K6AxPZdRFlTxauGLtzK5KNOzTOIRLBoApT1ArByXMbaGDsp2sJVaeD33WmHAFeoeySEV AxHbSt0WPZ6DFYiYx5sJwcQbML3r3+GTLSJ5zF0LH0Uk0MTYNUGzN2sIaIVcOd2NicyEfHIcRW1 XmJ8GRe/wai2lxfcQsUEZ6sO1yfkujJKsjTCaIyzzddascllU71G3dcVCznVOU3fBzJStG1jc9+ hzb5g7MHobWz2LF8Mz93YRvtX/v8OQaWRfqk4N3ox8bzsl50iNYf5JGB0Q/LT4pMzETeWByMYS9 GqpBkNyQSj4o9mH9PtA1gUG6mOv2dcCEVHUso2fwnDnMjneMOdlcniQDwgUY8Hasc820YhHF1xB YEwAlfI/TeVBFxwUDJDen9rzHN5W34VgvJ1RZkyekcGq90PoufXUz+fTAkorbhM+ANPTE050YgJ IbPUBExoSmnwQtWa3x/DUP+Y5plELRxrA43iIhPw39FRFqQr4uTRQsEz8CxD+geaekDEguJ/9NU DLcLkKLjQt7RrZuiHDC716om51JKkxfkuoXP54jvnoGkmKvsressMFf/CtPOKtshYWBTVF4Ek78 QbeHYFBT4rwZyS/ov+qudMAk/+y1DYfc8Gbb5gXLRQpBQamTNtlwgo8ZqC04cyqu65NuL85yQ6o +lpLd4ndAKoQw5Q== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz From: Petr Hodina Basic touchscreen connected to second i2c bus. Signed-off-by: Petr Hodina Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov Co-developed-by: David Heidelberg Signed-off-by: David Heidelberg Reviewed-by: Abel Vesa --- arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts | 19 +++++++++++++++++= +- arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts b/arch/arm= 64/boot/dts/qcom/sdm845-google-blueline.dts index fa89be500fb85..51c835dca43f1 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts @@ -21,17 +21,34 @@ &framebuffer0 { stride =3D <(1080 * 4)>; }; =20 &i2c2 { clock-frequency =3D <1000000>; =20 status =3D "okay"; =20 - /* ST,FTS @ 49 */ + touchscreen@49 { + compatible =3D "st,stmfts5"; + reg =3D <0x49>; + + pinctrl-0 =3D <&touchscreen_irq_n>, <&touchscreen_reset>; + pinctrl-names =3D "default"; + + interrupts-extended =3D <&tlmm 125 IRQ_TYPE_LEVEL_LOW>; + + mode-switch-gpios =3D <&tlmm 136 GPIO_ACTIVE_HIGH>; + reset-gpios =3D <&tlmm 99 GPIO_ACTIVE_LOW>; + + avdd-supply =3D <&vreg_l19a_3p3>; + vdd-supply =3D <&vreg_l14a_1p8>; + + touchscreen-size-x =3D <1080>; + touchscreen-size-y =3D <2160>; + }; }; =20 &mdss_dsi0 { vdda-supply =3D <&vdda_mipi_dsi0_1p2>; =20 status =3D "okay"; =20 panel@0 { diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi b/arch/arm6= 4/boot/dts/qcom/sdm845-google-common.dtsi index 9e952f9862f24..c9db3ea50f5ed 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi @@ -492,17 +492,17 @@ nfc_enable_default: nfc-enable-default-state { =20 touchscreen_reset: ts-reset-state { pins =3D "gpio99"; function =3D "gpio"; drive-strength =3D <8>; bias-pull-up; }; =20 - touchscreen_pins: ts-pins-gpio-state { + touchscreen_irq_n: ts-irq-n-gpio-state { pins =3D "gpio125"; function =3D "gpio"; drive-strength =3D <2>; bias-disable; }; =20 touchscreen_i2c_pins: qup-i2c2-gpio-state { pins =3D "gpio27", "gpio28"; --=20 2.55.0