From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22B9310FC45F for ; Wed, 8 Apr 2026 22:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7oELdqEHEWMDeDZINXtmpaEUHq6Op9B6eDl5Zdc8WgU=; b=gkN4A/x9w4wPCkWiZIL+vDYsdq xHC740sEH5vPcOxqv6gqUaekPTORw2V03ONSX8Qir2jRJGR5oyLFTGhqUEGW9perIfG4NjcEP9CoT tXOyTyCQnV7IK73YbHyFazaNaGjHDN+7LfVZNzHMzgjnZJzscRvXWPz6xvvA6iMVnyrPw4D2oG9ko oehW8lUbxinJsVi1H5Rc1Yg1E/WyvbaPXv7ovj8zvdeRykQiCODvHvrHQl1wMCCj2k/m7C+aTU0qy 2m1a9tXzHgP9/hNtP9qu31s3OifV/32SsQu1hr3vv6t150+1Lc4P00efR+grFTF+BV+16UzbBAPsH F0csQYqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wAbBv-00000009TNy-35AX; Wed, 08 Apr 2026 22:16:07 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wAbBi-00000009TBJ-2UqO for linux-arm-kernel@lists.infradead.org; Wed, 08 Apr 2026 22:15:56 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 5F9BE44586; Wed, 8 Apr 2026 22:15:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 3D9D3C4AF17; Wed, 8 Apr 2026 22:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775686551; bh=tIGlpaZemR7d9jsS6ALEP2ty9nV53WoTZhmA6w5EOzQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=qnKl805arHr4X5girAsiPFn7ExGc8CeYFX5TK1GoWVe28nSxtJHjiPCjYcNHgSkSK SetpRadQqhzdpj5Jn4Y70uIqspqzs0LVdY7fwTnCXWtz9Pobl5motCkIBWxuFJItuN Xj4g0zfjazqOLBJxQZ+86X5RSbZhIV2j80BSZabvv1uU5wzN9RnlJHDwUm9Ycmq0kn y9LjMgvJBZvebtjeWsbjLgoxaOEEIIwQsy6yq31TzatrG2Ms/4hB11cBPpAW7/OF5O yuA3rSBkgVIeq2UbFlIGvoVSlZ/2Pirzv8kvZmlYkqbXMoikhXUHrsIzmiUzEdSG8T 1CpdBsslo7ZUQ== 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 349B810FC456; Wed, 8 Apr 2026 22:15:51 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Thu, 09 Apr 2026 00:15:53 +0200 Subject: [PATCH v4 10/11] Input: stmfts - support FTS5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260409-stmfts5-v4-10-64fe62027db5@ixit.cz> References: <20260409-stmfts5-v4-0-64fe62027db5@ixit.cz> In-Reply-To: <20260409-stmfts5-v4-0-64fe62027db5@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.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=21867; i=david@ixit.cz; h=from:subject:message-id; bh=4yzi3sZ1WrcyDdT4cObbylaxzviewGT13ZUpejt5KwA=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBp1tOSSQM9ZDers0D6ZkQAIQXvNfJedWUP7/rgB k887jbKQuaJAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCadbTkgAKCRBgAj/E00kg cqK7D/9YjFVLv7Ejxnlo7Rhy39Q/dFeezgFbdzdYChffYIkOPb5ap+7e9ttYoxZ51BadkGzUzvR S273+WKq6AF4DVtFuWF7RglKoDMyVdLeKbXYU3Rkt45RySeoFDyRR7OJaeGOIcqRuWNyFMwrd6p Z0pDO3oNQYwNrBqDcKpqeHmYlth1nI8zWzqERDk1ypVdmDvjbyGmHV9kSlA/grCabaBoBhSXMH7 5yTMxBvKQa096SAxJxVvP9SGVfRShniO5SOsKN3svyGsWy8bORgsnO9biOHXD2PbDOPrlrRLAiT l2zQ/nNxEqYbdOkwi4E15zFFuWm9kG7zoolqeDP5T0ZwAdFFZJvrGUr+YYrFKb8Fs7bN4LcC6w/ zoVO5HUVk4/ujKj/RSkBwlCxOc4yAQDL+4x7qgcILdEgXtidiOyVPYoDtKIOYnufsmRnmSqBjab UP354RDvwFRx37y7KKid/9UmpT1L/2scsL+k8vuL4rbWuiqh2kVQyOyq2szCDD1gzxXBR1gNo5C 1PrbsYsvmDo3lXzp66wrVEbSC4OYvjUGnmTPjOmg87RZUdL/vv+vwO4Me7Ss5Js/BKCAogJr0yY FrIfNnRmxY6NVkYnTtDnS8v/aFuPxjidMO/EBPqi3F2bQuZebbIrsMbiAwIjqMsJ14QgnV22a7t OX4jtW5W2wM04bA== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260408_151554_751988_AB2C8F7D X-CRM114-Status: GOOD ( 25.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: david@ixit.cz Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Petr Hodina 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) and many others. Signed-off-by: Petr Hodina Co-developed-by: David Heidelberg Signed-off-by: David Heidelberg --- drivers/input/touchscreen/stmfts.c | 494 ++++++++++++++++++++++++++++++++++--- 1 file changed, 466 insertions(+), 28 deletions(-) diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c index 1e6d9a287cd0c..e613299e37557 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -1,8 +1,11 @@ // 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 + */ #include #include @@ -12,6 +15,7 @@ #include #include #include +#include #include #include @@ -34,6 +38,7 @@ #define STMFTS_FULL_FORCE_CALIBRATION 0xa2 #define STMFTS_MS_CX_TUNING 0xa3 #define STMFTS_SS_CX_TUNING 0xa4 +#define STMFTS5_SET_SCAN_MODE 0xa0 /* events */ #define STMFTS_EV_NO_EVENT 0x00 @@ -51,12 +56,32 @@ #define STMFTS_EV_STATUS 0x16 #define STMFTS_EV_DEBUG 0xdb +/* events FTS5 */ +#define STMFTS5_EV_CONTROLLER_READY 0x03 +/* FTM5 event IDs (full byte, not masked) */ +#define STMFTS5_EV_MULTI_TOUCH_ENTER 0x13 +#define STMFTS5_EV_MULTI_TOUCH_MOTION 0x23 +#define STMFTS5_EV_MULTI_TOUCH_LEAVE 0x33 +#define STMFTS5_EV_STATUS_UPDATE 0x43 +#define STMFTS5_EV_USER_REPORT 0x53 +#define STMFTS5_EV_DEBUG 0xe3 +#define STMFTS5_EV_ERROR 0xf3 + /* 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_TOUCH_TYPE 0x0f + +/* 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 /* key related event masks */ #define STMFTS_MASK_KEY_NO_TOUCH 0x00 @@ -75,9 +100,12 @@ static const struct regulator_bulk_data stmfts_supplies[] = { }; 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; @@ -101,12 +129,27 @@ struct stmfts_data { struct completion cmd_done; + unsigned long touch_id; + unsigned long stylus_id; + bool use_key; bool led_status; bool hover_enabled; + bool stylus_enabled; bool running; }; +struct stmfts_chip_ops { + int (*configure)(struct stmfts_data *sdata); + void (*power_off)(struct stmfts_data *sdata); + int (*setup_input)(struct stmfts_data *sdata); + int (*input_open)(struct input_dev *dev); + void (*input_close)(struct input_dev *dev); + void (*parse_events)(struct stmfts_data *sdata); + 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) { @@ -169,6 +212,7 @@ static int stmfts_read_events(struct stmfts_data *sdata) return ret == ARRAY_SIZE(msgs) ? 0 : -EIO; } +/* FTS4 event handling functions */ static void stmfts_report_contact_event(struct stmfts_data *sdata, const u8 event[]) { @@ -204,6 +248,157 @@ static void stmfts_report_contact_release(struct stmfts_data *sdata, input_sync(sdata->input); } +/* FTS5 event handling functions */ +static void stmfts5_report_contact_event(struct stmfts_data *sdata, + const u8 event[]) +{ + u8 area; + u8 maj; + u8 min; + /* FTM5 event format: + * event[0] = event ID (0x13/0x23) + * event[1] = touch type (low 4 bits) | touch ID (high 4 bits) + * event[2] = X LSB + * event[3] = X MSB (low 4 bits) | Y MSB (high 4 bits) + * event[4] = Y LSB + * event[5] = pressure + * event[6] = major (low 4 bits) | minor (high 4 bits) + * event[7] = minor (high 2 bits) + */ + u8 touch_id = (event[1] & STMFTS_MASK_TOUCH_ID) >> 4; + u8 touch_type = event[1] & STMFTS5_MASK_TOUCH_TYPE; + int x, y, distance; + unsigned int tool = MT_TOOL_FINGER; + bool touch_condition = true; + + /* Parse coordinates with better precision */ + x = (((int)event[3] & STMFTS_MASK_X_MSB) << 8) | event[2]; + y = ((int)event[4] << 4) | ((event[3] & STMFTS_MASK_Y_LSB) >> 4); + + /* Parse pressure - ensure non-zero for active touch */ + area = event[5]; + if (area <= 0 && touch_type != STMFTS_TOUCH_TYPE_HOVER) { + /* 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 = 1; + } + + /* Parse touch area with improved bit extraction */ + maj = (((event[0] & 0x0C) << 2) | ((event[6] & 0xF0) >> 4)); + min = (((event[7] & 0xC0) >> 2) | (event[6] & 0x0F)); + + /* Distance is 0 for touching, max for hovering */ + distance = 0; + + /* Classify touch type and set appropriate tool and parameters */ + switch (touch_type) { + case STMFTS_TOUCH_TYPE_STYLUS: + if (sdata->stylus_enabled) { + tool = MT_TOOL_PEN; + __set_bit(touch_id, &sdata->stylus_id); + __clear_bit(touch_id, &sdata->touch_id); + break; + } + fallthrough; /* Report as finger if stylus not enabled */ + + case STMFTS_TOUCH_TYPE_FINGER: + case STMFTS_TOUCH_TYPE_GLOVE: + tool = MT_TOOL_FINGER; + __set_bit(touch_id, &sdata->touch_id); + __clear_bit(touch_id, &sdata->stylus_id); + break; + + case STMFTS_TOUCH_TYPE_PALM: + /* Palm touch - report but can be filtered by userspace */ + tool = MT_TOOL_PALM; + __set_bit(touch_id, &sdata->touch_id); + __clear_bit(touch_id, &sdata->stylus_id); + break; + + case STMFTS_TOUCH_TYPE_HOVER: + tool = MT_TOOL_FINGER; + touch_condition = false; + area = 0; + distance = 255; + __set_bit(touch_id, &sdata->touch_id); + __clear_bit(touch_id, &sdata->stylus_id); + 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; + } + + /* Boundary check - some devices report max value, adjust */ + if (x >= sdata->prop.max_x) + x = sdata->prop.max_x - 1; + if (y >= sdata->prop.max_y) + y = sdata->prop.max_y - 1; + + input_mt_slot(sdata->input, touch_id); + input_report_key(sdata->input, BTN_TOUCH, touch_condition); + 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); + + input_sync(sdata->input); +} + +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 = (event[1] & STMFTS_MASK_TOUCH_ID) >> 4; + u8 touch_type = event[1] & STMFTS5_MASK_TOUCH_TYPE; + unsigned int tool = MT_TOOL_FINGER; + + /* Determine tool type based on touch classification */ + switch (touch_type) { + case STMFTS_TOUCH_TYPE_STYLUS: + if (sdata->stylus_enabled) { + tool = MT_TOOL_PEN; + __clear_bit(touch_id, &sdata->stylus_id); + } else { + __clear_bit(touch_id, &sdata->touch_id); + } + break; + + case STMFTS_TOUCH_TYPE_PALM: + tool = MT_TOOL_PALM; + __clear_bit(touch_id, &sdata->touch_id); + break; + + case STMFTS_TOUCH_TYPE_FINGER: + case STMFTS_TOUCH_TYPE_GLOVE: + case STMFTS_TOUCH_TYPE_HOVER: + default: + tool = MT_TOOL_FINGER; + __clear_bit(touch_id, &sdata->touch_id); + break; + } + + input_mt_slot(sdata->input, touch_id); + input_report_abs(sdata->input, ABS_MT_PRESSURE, 0); + input_mt_report_slot_state(sdata->input, tool, false); + + /* Report BTN_TOUCH only if no touches remain */ + if (!sdata->touch_id && !sdata->stylus_id) + input_report_key(sdata->input, BTN_TOUCH, 0); + + input_sync(sdata->input); +} + static void stmfts_report_hover_event(struct stmfts_data *sdata, const u8 event[]) { @@ -251,7 +446,6 @@ static void stmfts_parse_events(struct stmfts_data *sdata) u8 *event = &sdata->data[i * STMFTS_EVENT_SIZE]; switch (event[0]) { - case STMFTS_EV_CONTROLLER_READY: case STMFTS_EV_SLEEP_OUT_CONTROLLER_READY: case STMFTS_EV_STATUS: @@ -264,7 +458,6 @@ static void stmfts_parse_events(struct stmfts_data *sdata) } switch (event[0] & STMFTS_MASK_EVENT_ID) { - case STMFTS_EV_MULTI_TOUCH_ENTER: case STMFTS_EV_MULTI_TOUCH_MOTION: stmfts_report_contact_event(sdata, event); @@ -298,6 +491,45 @@ static void stmfts_parse_events(struct stmfts_data *sdata) } } +static void stmfts5_parse_events(struct stmfts_data *sdata) +{ + for (int i = 0; i < STMFTS_STACK_DEPTH; i++) { + u8 *event = &sdata->data[i * STMFTS_EVENT_SIZE]; + + switch (event[0]) { + case STMFTS5_EV_CONTROLLER_READY: + complete(&sdata->cmd_done); + fallthrough; + + case STMFTS_EV_NO_EVENT: + case STMFTS5_EV_STATUS_UPDATE: + case STMFTS5_EV_USER_REPORT: + case STMFTS5_EV_DEBUG: + return; + + 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]); + } + } +} + static irqreturn_t stmfts_irq_handler(int irq, void *dev) { struct stmfts_data *sdata = dev; @@ -310,7 +542,7 @@ static irqreturn_t stmfts_irq_handler(int irq, void *dev) dev_err(&sdata->client->dev, "failed to read events: %d\n", err); else - stmfts_parse_events(sdata); + sdata->ops->parse_events(sdata); return IRQ_HANDLED; } @@ -332,6 +564,25 @@ static int stmfts_command(struct stmfts_data *sdata, const u8 cmd) return 0; } +static int stmfts5_set_scan_mode(struct stmfts_data *sdata, const u8 val) +{ + int err; + + u8 scan_mode_cmd[3] = { STMFTS5_SET_SCAN_MODE, 0x00, val }; + struct i2c_msg msg = { + .addr = sdata->client->addr, + .len = sizeof(scan_mode_cmd), + .buf = scan_mode_cmd, + }; + + err = i2c_transfer(sdata->client->adapter, &msg, 1); + if (err != 1) + return err < 0 ? err : -EIO; + + return 0; + +} + static int stmfts_input_open(struct input_dev *dev) { struct stmfts_data *sdata = input_get_drvdata(dev); @@ -371,6 +622,28 @@ static int stmfts_input_open(struct input_dev *dev) return 0; } +static int stmfts5_input_open(struct input_dev *dev) +{ + struct stmfts_data *sdata = input_get_drvdata(dev); + int err; + + err = pm_runtime_resume_and_get(&sdata->client->dev); + if (err) + return err; + + mutex_lock(&sdata->mutex); + sdata->running = true; + mutex_unlock(&sdata->mutex); + + err = stmfts5_set_scan_mode(sdata, 0xff); + if (err) { + pm_runtime_put_sync(&sdata->client->dev); + return err; + } + + return 0; +} + static void stmfts_input_close(struct input_dev *dev) { struct stmfts_data *sdata = input_get_drvdata(dev); @@ -404,6 +677,23 @@ static void stmfts_input_close(struct input_dev *dev) pm_runtime_put_sync(&sdata->client->dev); } +static void stmfts5_input_close(struct input_dev *dev) +{ + struct stmfts_data *sdata = input_get_drvdata(dev); + int err; + + err = stmfts5_set_scan_mode(sdata, 0x00); + if (err) + dev_warn(&sdata->client->dev, + "failed to disable touchscreen: %d\n", err); + + mutex_lock(&sdata->mutex); + sdata->running = false; + mutex_unlock(&sdata->mutex); + + pm_runtime_put_sync(&sdata->client->dev); +} + static ssize_t stmfts_sysfs_chip_id(struct device *dev, struct device_attribute *attr, char *buf) { @@ -484,10 +774,8 @@ static ssize_t stmfts_sysfs_hover_enable_write(struct device *dev, guard(mutex)(&sdata->mutex); if (hover != sdata->hover_enabled) { - if (sdata->running) { - err = 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 = sdata->ops->set_hover(sdata, hover); if (err) return err; } @@ -612,7 +900,7 @@ static int stmfts_power_on(struct stmfts_data *sdata) if (sdata->reset_gpio) stmfts_reset(sdata); - err = stmfts_configure(sdata); + err = sdata->ops->configure(sdata); if (err) regulator_bulk_disable(ARRAY_SIZE(stmfts_supplies), sdata->supplies); @@ -620,6 +908,29 @@ static int stmfts_power_on(struct stmfts_data *sdata) return err; } +static int stmfts5_configure(struct stmfts_data *sdata) +{ + u8 event[STMFTS_EVENT_SIZE]; + int ret; + + /* Verify I2C communication */ + ret = i2c_smbus_read_i2c_block_data(sdata->client, + STMFTS_READ_ALL_EVENT, + sizeof(event), event); + if (ret < 0) + return ret; + + enable_irq(sdata->client->irq); + + return 0; +} + +static void stmfts5_chip_power_off(struct stmfts_data *sdata) +{ + i2c_smbus_write_byte(sdata->client, STMFTS_SLEEP_IN); + msleep(20); +} + static void stmfts_power_off(void *data) { struct stmfts_data *sdata = data; @@ -629,10 +940,73 @@ static void stmfts_power_off(void *data) if (sdata->reset_gpio) gpiod_set_value_cansleep(sdata->reset_gpio, 1); + if (sdata->ops->power_off) + sdata->ops->power_off(sdata); + regulator_bulk_disable(ARRAY_SIZE(stmfts_supplies), sdata->supplies); } +static int stmfts_setup_input(struct stmfts_data *sdata) +{ + struct device *dev = &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 = 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 = &sdata->client->dev; + + sdata->mode_switch_gpio = 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"); + + /* Mark as direct input device for calibration support */ + __set_bit(INPUT_PROP_DIRECT, sdata->input->propbit); + + /* Set up basic touch capabilities */ + input_set_capability(sdata->input, EV_KEY, BTN_TOUCH); + + /* 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 = device_property_read_bool(dev, "stylus-enabled"); + + /* Initialize touch tracking bitmaps */ + sdata->touch_id = 0; + sdata->stylus_id = 0; + + /* Initialize MT slots with support for pen tool type */ + return input_mt_init_slots(sdata->input, STMFTS_MAX_FINGERS, + INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED); +} + +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 stmfts_enable_led(struct stmfts_data *sdata) { int err; @@ -678,6 +1052,8 @@ static int stmfts_probe(struct i2c_client *client) mutex_init(&sdata->mutex); init_completion(&sdata->cmd_done); + sdata->ops = of_device_get_match_data(dev); + err = devm_regulator_bulk_get_const(dev, ARRAY_SIZE(stmfts_supplies), stmfts_supplies, @@ -697,8 +1073,8 @@ static int stmfts_probe(struct i2c_client *client) sdata->input->name = STMFTS_DEV_NAME; sdata->input->id.bustype = BUS_I2C; - sdata->input->open = stmfts_input_open; - sdata->input->close = stmfts_input_close; + sdata->input->open = sdata->ops->input_open; + sdata->input->close = sdata->ops->input_close; input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_X); input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_Y); @@ -706,19 +1082,9 @@ static int stmfts_probe(struct i2c_client *client) 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 = 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); - } - err = input_mt_init_slots(sdata->input, - STMFTS_MAX_FINGERS, INPUT_MT_DIRECT); + err = sdata->ops->setup_input(sdata); if (err) return err; @@ -789,13 +1155,62 @@ static int stmfts_runtime_suspend(struct device *dev) return ret; } -static int stmfts_runtime_resume(struct device *dev) +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 stmfts_data *sdata = dev_get_drvdata(dev); struct i2c_client *client = sdata->client; + struct device *dev = &client->dev; + u8 int_enable_cmd[4] = {0xB6, 0x00, 0x2C, 0x01}; + struct i2c_msg msg = { + .addr = client->addr, + .len = sizeof(int_enable_cmd), + .buf = int_enable_cmd, + }; int ret; ret = i2c_smbus_write_byte(client, STMFTS_SLEEP_OUT); + if (ret) + return ret; + + msleep(20); + + /* Perform capacitance tuning after wakeup */ + ret = i2c_smbus_write_byte(client, STMFTS_MS_CX_TUNING); + if (ret) + dev_warn(dev, "MS_CX_TUNING failed: %d\n", ret); + msleep(20); + + ret = i2c_smbus_write_byte(client, STMFTS_SS_CX_TUNING); + if (ret) + dev_warn(dev, "SS_CX_TUNING failed: %d\n", ret); + msleep(20); + + /* Force calibration */ + ret = i2c_smbus_write_byte(client, STMFTS_FULL_FORCE_CALIBRATION); + if (ret) + dev_warn(dev, "FORCE_CALIBRATION failed: %d\n", ret); + msleep(50); + + /* Enable controller interrupts */ + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret != 1) + return ret < 0 ? ret : -EIO; + + msleep(20); + + return 0; +} + +static int stmfts_runtime_resume(struct device *dev) +{ + struct stmfts_data *sdata = dev_get_drvdata(dev); + int ret; + + ret = sdata->ops->runtime_resume(sdata); if (ret) dev_err(dev, "failed to resume device: %d\n", ret); @@ -824,8 +1239,29 @@ static const struct dev_pm_ops stmfts_pm_ops = { }; #ifdef CONFIG_OF +static const struct stmfts_chip_ops stmfts4_ops = { + .configure = stmfts_configure, + .setup_input = stmfts_setup_input, + .input_open = stmfts_input_open, + .input_close = stmfts_input_close, + .parse_events = stmfts_parse_events, + .set_hover = stmfts_set_hover, + .runtime_resume = stmfts_chip_runtime_resume, +}; + +static const struct stmfts_chip_ops stmfts5_ops = { + .configure = stmfts5_configure, + .power_off = stmfts5_chip_power_off, + .setup_input = stmfts5_setup_input, + .input_open = stmfts5_input_open, + .input_close = stmfts5_input_close, + .parse_events = stmfts5_parse_events, + .runtime_resume = stmfts5_chip_runtime_resume, +}; + static const struct of_device_id stmfts_of_match[] = { - { .compatible = "st,stmfts", }, + { .compatible = "st,stmfts", .data = &stmfts4_ops }, + { .compatible = "st,stmfts5", .data = &stmfts5_ops }, { }, }; MODULE_DEVICE_TABLE(of, stmfts_of_match); @@ -853,5 +1289,7 @@ static struct i2c_driver stmfts_driver = { module_i2c_driver(stmfts_driver); MODULE_AUTHOR("Andi Shyti "); +MODULE_AUTHOR("David Heidelberg "); +MODULE_AUTHOR("Petr Hodina "); MODULE_DESCRIPTION("STMicroelectronics FTS Touch Screen"); MODULE_LICENSE("GPL"); -- 2.53.0