From patchwork Wed Oct 16 04:02:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 835968 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2099.outbound.protection.outlook.com [40.107.104.99]) (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 53946290F; Wed, 16 Oct 2024 04:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.104.99 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729051383; cv=fail; b=abaMM7H6h0E1zuVYdYUXyH4wQ+h+583/sYaku18l6Y0oDgNMg/xdYAExjZ1p47JRRRAtMlUZNE72BIEfU2M4yGFutsVPB5eSBNPPp91vHUKhf0w9cNdsu+WZE9ADPp8K8U3jUy8A3yNbGlD6RrO0oOvXj3LE0TGQC1jgbpE+1ic= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729051383; c=relaxed/simple; bh=6Rd06mzprzVBozWdIS79zpyXpkHY0oY+g8+KrxW3IOM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=eJjRo/YU5MmxSbF57uOLyO0aqFNRj1xd+Ojou6+9yR9Wg99sDoQCEZ67b1Ye8R9S2k/6SO1UW1TsSV6/dLf7Dvr8XTFnopHBM898xlqmtEsG/14/PqCZrMznmDMfyNqKVjxkzvFfEKMfbBv6dC8n3Ex4rHINb3eOQRUiJ4yR5fo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net; spf=pass smtp.mailfrom=wolfvision.net; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b=eKGV5CfY; arc=fail smtp.client-ip=40.107.104.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b="eKGV5CfY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dTpX33ZQR1uZl9d0uG2kPqOyEzUsb4JD92TJjlgBnRJnE9eqHpeaH1dLjbgIoYlkCgAWQ4pE7KpO/Yxi20x4vpJ5R4WAWrpVHLoU/w6rqPtL1SSEkBghYtXScygjJwzsH5WSORqulm7D1L3d+9V+l+UU0fKAd4td4ZrAMVOgQtTttPFepNfW5PxbKfFtXRVBtYb6XCxJgBCWUu5RHtzvdk73NOBCc/kIkObQA6HYFaYAB1qFGHk60caHgf+4ddR0etbKh7WOUqRXZE3IN5qNz3NrjRvKm+5Vvl24JJyefm8u2MBjhQhICgqekWdB+XlW9oKH8t0gVlglyenNr8qOfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=R8aCWi7+qUdaWhJcJz61qNnK96Og/DumwNYjndfUjZo=; b=Lhm9ecbnyxP+/JjUltpT8Uz7U3WfJ0ltfmeiiDM9Lw4frY8LJ3hZ28ttMK3EfT6RDikUGeu2P4QOKLTTYxAdMuSjFdaRDLdV0GDnm1IBqLSMmDZyd6YRLxpTGML2WRP2NZetAvs3GqFLdWeWZFHTXyMefKzlfDewN11bMk+PoWY2uu8lHPQwr7i65I3jp11msaK9w9IP30J4tykZJ11szQ91qbWnEwp768GKC4Ca8MFvAtd92pHLCxqCy5Fne+xLb4ctGmecxGzBdhNCm6xThUjUKy8P1LvPg2smoEhYzg4OWEVPacMNz1lcOg6qUaTFrUWYRlD4KNTboWwlk1rIUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R8aCWi7+qUdaWhJcJz61qNnK96Og/DumwNYjndfUjZo=; b=eKGV5CfYd15QsTJFh71ooQMVWE+kngURGo6SWzMeJKknAy6blLUsobC0yQ/ePESxQFQbZanxmu4heIimvG4mMe9a/z2H4EucgwkTvEH5kCmb0aWZQfms21lRDterfpQ2BkE0mcO5iKYzjkHYQwe9l9ZYbaBKMiSYWmdjBvVBBTo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DB4PR08MB9190.eurprd08.prod.outlook.com (2603:10a6:10:3fd::21) by PAWPR08MB10183.eurprd08.prod.outlook.com (2603:10a6:102:368::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Wed, 16 Oct 2024 04:02:52 +0000 Received: from DB4PR08MB9190.eurprd08.prod.outlook.com ([fe80::c7a:6978:9afa:19a4]) by DB4PR08MB9190.eurprd08.prod.outlook.com ([fe80::c7a:6978:9afa:19a4%6]) with mapi id 15.20.8048.020; Wed, 16 Oct 2024 04:02:52 +0000 From: Javier Carrasco Date: Wed, 16 Oct 2024 06:02:43 +0200 Subject: [PATCH v11 4/4] Input: st1232 - add touch-overlay handling Message-Id: <20241016-feature-ts_virtobj_patch-v11-4-b292a1bbb0a1@wolfvision.net> References: <20241016-feature-ts_virtobj_patch-v11-0-b292a1bbb0a1@wolfvision.net> In-Reply-To: <20241016-feature-ts_virtobj_patch-v11-0-b292a1bbb0a1@wolfvision.net> To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bastian Hecht , Michael Riesch Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , Jeff LaBundy X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1729051368; l=3162; i=javier.carrasco@wolfvision.net; s=20240617; h=from:subject:message-id; bh=6Rd06mzprzVBozWdIS79zpyXpkHY0oY+g8+KrxW3IOM=; b=VF44P9sxVB7wtJtTURWetgKIiz/ENaKIyFWiF/DEWnWiMyykkaPCFvM0ahcPkyKbrmIe7GSqA boT59t/HczUBYWKZ1/IJCieumLYG4wubuz8IHvD4EHVsgQtdoJ3e3n/ X-Developer-Key: i=javier.carrasco@wolfvision.net; a=ed25519; pk=hfASRUP6l4lf3Lo2mjLM085/h37dT3m0Qj1HejXDPDc= X-ClientProxiedBy: VI1PR07CA0154.eurprd07.prod.outlook.com (2603:10a6:802:16::41) To DB4PR08MB9190.eurprd08.prod.outlook.com (2603:10a6:10:3fd::21) Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB4PR08MB9190:EE_|PAWPR08MB10183:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b06a46b-5030-4d04-a3e1-08dced976826 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|1800799024|366016|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?w0F+nfrv1ApSbdOkraOQVC45eOFgQr+?= =?utf-8?q?o9P7e+AlrigxZI98gRpsaMtbVvKVr0bNAEofSU8/IC1NX+4m8k/og+Env97XuUfIE?= =?utf-8?q?+ZqCn5GA+22r51/mJ0Srw4DDEb8p8c6VD9bZWB9yXeKZYZSgdkXGXUWsAqj9QRYtU?= =?utf-8?q?Xw3RjTttnUL4GJQNA5+0l3XnlEtvj0YL0I+XFZAp2rPnhyCcWoetkSDbHGsqbD3+B?= =?utf-8?q?5H5SF6b8/R2jjURVMoFRZDLg21NfAglhKe8bVnP92J4g8alm6wE5Cos0T9zN+2Vv5?= =?utf-8?q?gf+bXaPan86aC0eUrDnMrDZmA0eIG3E8EDVv6U2UcILaM6029sOiI1lOEdwsKad1e?= =?utf-8?q?TEqEKzWLFTnnrhMs3oqcNmDBL/efwIYKzowAC2OXlAVXlOHBc7hCcTlsTRrXhRsm5?= =?utf-8?q?f2H3R2yWQUyPR46TQTrqJmDLcTcLNxXl8g11LqMSl5Df5OtyBG8uzTByyp4eSvs9l?= =?utf-8?q?YxmqHRZ9PdhJdaGND+Jmkxls9l+PyJ5C9bEp2+KYKLReYentBIERsRbkJc0ChzE6H?= =?utf-8?q?jYA6xeFLt0RHcae2+hSGO5gaAn11MIH+ZKK1DIa1HYo8oq/Qzd0tVpn3n34nRXGeM?= =?utf-8?q?HjJJqCuCSkPYjoTvgVq6cAgOMXv3o7/ACCq145BWp09lMYdPftZVpvEltCjKSnACH?= =?utf-8?q?8c58qE/nX9uHDKB0/0ezhNMgkAQTw/CtSFuUmZg2xy8l0kX34zZrqI3MQIlzzyJJA?= =?utf-8?q?pgZz2lz/BEACdwGdvVDEBu+E+P6ZK0irIF6r/XOSSa3U84NA3wGDTOUO0l9kiCfRJ?= =?utf-8?q?4R612q5QqH8fIqeRkCxr0vk6u5Ws/xL71PYnxUBQURRYPyQfsLh847MjgLt99rr0Z?= =?utf-8?q?t3YwjUexkwQuJcvWRjdj37GIT97FbWL5gouQdg8/EL+KTLpqXjaLT0me8hKaN5mJn?= =?utf-8?q?ilzMjKHwdtHj17yVCUiQqkcD+L192zbZ+roXN4qUe8v5JfLjH3c5s4miRte9FU7Vw?= =?utf-8?q?Gn+7o/gTm4tfFCEv9palAjnQy+GNgbI7sfyCu7fNCufKXF3rMf0JYtwKXuhKn2rXy?= =?utf-8?q?Db4JbbQjXyOr0CheuU4TWTZrBPR1ber2Y+wiIwaLRI5pmH7h0KcoOWO1nUwEqN5wX?= =?utf-8?q?/h+myRREBK1f75MirOlh1/qdx0sbLavOHtgCmw84+yKGGMqDzJqnBZT3vngvH8kTh?= =?utf-8?q?s2l2fwzVVpnLBJDUzwgwgkzvIqQyHA7T5uxzvVrc9dYcT3MoZNhIkgdnxEhCKsiRz?= =?utf-8?q?V3DpT51fNDXwVp/Y5SnFoAcwDh0zv1wyM79zp7zM2/u3v4hvMoHKTI4QU7LQHR8Mc?= =?utf-8?q?hLFiNGUdAq/A9Ucq6svxwWdiaSxx7OeW82w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB4PR08MB9190.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(1800799024)(366016)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?lAZDpD4nk6IhYlYp3/zbaCZMpiUh?= =?utf-8?q?06elMPxIXAa/oqmkB8TP/a5EFNwvPrgLyzHvfrccNxyv7IutfZcttUee4wyFLNE1u?= =?utf-8?q?YIku5S1RWfJBZunjEgXULMkn7Rms+n9AsIMyI8pKlMXqralNFk/jJwVBWB+Susn2k?= =?utf-8?q?ThxnbBhmh7sS6eesPBTRVEO/+0jsgDSRblTHLy7oWLXM4yY+Ji8dQ9wGpKfV5yBUs?= =?utf-8?q?2dN9tFhsXrI47uAfc1HAu1oFGYqQDkYgrsWiFQ0vqHH9gHY3nJOn/f4/x3IRdJ58W?= =?utf-8?q?hwYFJ7yW/qOrr4hYddoOq6Se0D/lHC6vfVwVHkqJhQJLIN9lwb0zY2cTot9j7wJ3+?= =?utf-8?q?ehmgA3ke4Go5VQACRtv05ggPiCtAL3pIZ+jsPbSCR71HY4PZdYM+ODx8SoF7NKsNI?= =?utf-8?q?mFaY1ZVJmvFIO6zZDnLvcYHINOQX8r4jOb89rVp1X/P/R5nMRe66tVIbrGg6n0EaM?= =?utf-8?q?JbKYeR1AgZJJHdn4+ZvkZRb3QvFfIsHikJ2v6k8MG5RTmmLnDts4A6GLNswUdc7Sq?= =?utf-8?q?F54EPmYh/9AFJK7V88x22nJ51KcuQSh3ABwrUvHzDkGdYP1ElWROgndqr/9c7S4Ix?= =?utf-8?q?FrKh2eC9yAOBzAJpVwzCBXXQrTjsRMd2V8EVxbUxJpBmAc+yWWrJnAz2WXOfxjl+e?= =?utf-8?q?4gRUINBrTBihpmwEqjM6ENax1NC+7tXjAMNMi+PnNOptFQve3KLUn1gw5Z284qge+?= =?utf-8?q?Zw0lQtwd94NlQJLgYhWPZ9WL1yz3Y5zpR/Ed02jOj+aNYX44/vi6Q9y+oQEs3MJEG?= =?utf-8?q?v8DA4TmZatIWSo2LqcBeuOENOL6MH6fIQSCdOwi5yuDbmwFoDNRKARKIobOFHvcOW?= =?utf-8?q?EmsGTvx93B2LTzOh0JVouvdwYjKktEaS2KF0shKSuAIg93Yr9ZreN5v2hG6U8mdr8?= =?utf-8?q?v/KpvlT0K3Ljt3QKHpgfelLG3UdXvc6Z2vdtErUZ9oDAs1dDdSPGvTeY9m4pd2AyY?= =?utf-8?q?RF/FzEc4ogm2BipR6EmmNz9dd5LPI5IMPup3gBIFO10RlmER8f1Uj/2WPSvrGMAfb?= =?utf-8?q?zCHbwfFsi+REK2Ml8SdLjp+avDDjCCD8YbFYGUJ/KbmdUgxmZsea/G89eEMfdoQ41?= =?utf-8?q?eWe91Es8brGSjSkvjfp9iR/YYe4PhWxsbaboJf2PZlJG7VOr4/isVQpNfPLB+V0YG?= =?utf-8?q?vg4xniH2TbNE7+1baURQWOvLrB8kQ44HGU/MRWOrk1IqtVpqITt77D40FEW4b2EZE?= =?utf-8?q?LScIpcOobxO4XcbJe+/sxbO6e8PZVWu5KwE/XWUalC8ZqkOgJ5PXqQwIX0+G4Hwrq?= =?utf-8?q?w/Ocrd4JKKheDn+YiVbLDmoeNDaX27ObxQ3kE+a8HpRSKA2+cy11BXOAMMOr72+rU?= =?utf-8?q?SxTdCneQEEh8NF3rBbA4tZX3U18HWg2P4iV8/T0gJ+PaOXUCYSVT6ojT3Uzs0BIJI?= =?utf-8?q?+L5ZKZMeo+naf+R2+AkXxB0iNP3sLyOptUDs+HUSsfzBb2FNOGubL6XfHyHp1I9L+?= =?utf-8?q?wmepulY9m31c+On0IuRxPc2KC20Gkd8fhBhzi8oTD6H2fZmfKU42VqLl6txi2M6y4?= =?utf-8?q?F357HDTPuZjnp10X2HHlzlLjiagVxNoF6tWxq4Wz7Q0H7/vSbCvCKDA=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 4b06a46b-5030-4d04-a3e1-08dced976826 X-MS-Exchange-CrossTenant-AuthSource: DB4PR08MB9190.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2024 04:02:52.3570 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 29dSvq+SUhKTuL3IWz/FWbXwR6iwHkbIXALG2n31dbk+39ANFTU5x7ZdNWuR2not1GB0rHyaIohYokAtsLYNlvhwrLUCohXDORqeprAl/QQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB10183 Use touch-overlay to support overlay objects such as buttons and a resized frame defined in the device tree. A key event will be generated if the coordinates of a touch event are within the area defined by the button properties. Reviewed-by: Jeff LaBundy Signed-off-by: Javier Carrasco --- drivers/input/touchscreen/st1232.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index 6475084aee1b..9b3901eec0a5 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c @@ -22,6 +22,7 @@ #include #include #include +#include #define ST1232_TS_NAME "st1232-ts" #define ST1633_TS_NAME "st1633-ts" @@ -57,6 +58,7 @@ struct st1232_ts_data { struct dev_pm_qos_request low_latency_req; struct gpio_desc *reset_gpio; const struct st_chip_info *chip_info; + struct list_head touch_overlay_list; int read_buf_len; u8 *read_buf; }; @@ -156,6 +158,10 @@ static int st1232_ts_parse_and_report(struct st1232_ts_data *ts) input_mt_assign_slots(input, slots, pos, n_contacts, 0); for (i = 0; i < n_contacts; i++) { + if (touch_overlay_process_contact(&ts->touch_overlay_list, + input, &pos[i], slots[i])) + continue; + input_mt_slot(input, slots[i]); input_mt_report_slot_state(input, MT_TOOL_FINGER, true); input_report_abs(input, ABS_MT_POSITION_X, pos[i].x); @@ -164,6 +170,7 @@ static int st1232_ts_parse_and_report(struct st1232_ts_data *ts) input_report_abs(input, ABS_MT_TOUCH_MAJOR, z[i]); } + touch_overlay_sync_frame(&ts->touch_overlay_list, input); input_mt_sync_frame(input); input_sync(input); @@ -292,18 +299,30 @@ static int st1232_ts_probe(struct i2c_client *client) if (error) return error; - /* Read resolution from the chip */ - error = st1232_ts_read_resolution(ts, &max_x, &max_y); - if (error) { - dev_err(&client->dev, - "Failed to read resolution: %d\n", error); - return error; - } - if (ts->chip_info->have_z) input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, ts->chip_info->max_area, 0, 0); + /* map overlay objects if defined in the device tree */ + INIT_LIST_HEAD(&ts->touch_overlay_list); + error = touch_overlay_map(&ts->touch_overlay_list, input_dev); + if (error) + return error; + + if (touch_overlay_mapped_touchscreen(&ts->touch_overlay_list)) { + /* Read resolution from the overlay touchscreen if defined */ + touch_overlay_get_touchscreen_abs(&ts->touch_overlay_list, + &max_x, &max_y); + } else { + /* Read resolution from the chip */ + error = st1232_ts_read_resolution(ts, &max_x, &max_y); + if (error) { + dev_err(&client->dev, + "Failed to read resolution: %d\n", error); + return error; + } + } + input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, max_x, 0, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_Y,