Received-SPF: pass (google.com: domain of linux-kernel+bounces-30859-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Javier Carrasco <javier.carrasco@wolfvision.net>
Date: Fri, 19 Jan 2024 08:43:36 +0100
Subject: [PATCH v7 4/4] Input: st1232 - add touch overlays handling
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240119-feature-ts_virtobj_patch-v7-4-eda70985808f@wolfvision.net>
References: <20240119-feature-ts_virtobj_patch-v7-0-eda70985808f@wolfvision.net>
In-Reply-To: <20240119-feature-ts_virtobj_patch-v7-0-eda70985808f@wolfvision.net>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>, 
 Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Henrik Rydberg <rydberg@bitmath.org>, 
 Bastian Hecht <hechtb@gmail.com>, 
 Michael Riesch <michael.riesch@wolfvision.net>, 
 Jeff LaBundy <jeff@labundy.com>
Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, 
 devicetree@vger.kernel.org, 
 Javier Carrasco <javier.carrasco@wolfvision.net>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?VTBMb0ZKMTB0VHQzUm80dm52UG5JUkpSTEdUK25zc1ArSFl0eUx3U3drY2Y4?=
 =?utf-8?B?c0hBSlFNa1F1YTkwRzV0czd6dE95NGVHQVlNWnJzQ3ozMWxVYno3bjZmTzBJ?=
 =?utf-8?B?NDIwWEt6TFBDWFVEVXkwMGZsSDd4RDljZmxpTjZWTHBNaVVVM0NzUFBVL0VD?=
 =?utf-8?B?U25RMHpMUHRmZWhwZU53Zzd3Tmh6S1N4L1Rua05hM3h4VENJYkMyYUg4eGNY?=
 =?utf-8?B?U1JldXpFWHhZYXRVN3A0N1JtOEdqRllmaHI0QkZTNm5sUTdOKys5UU5lQ0dH?=
 =?utf-8?B?MkRYSFFCZ29nUm5IMUhtNFdzMFFaK3dHVlZtd3JWaWViOHljckVjQmRSa1Bw?=
 =?utf-8?B?QmI3b3luc0xXVjZlSm5SQTliY09SaUtTWm5GMU1WZCtnR2Fuc0VYVXdZQU1R?=
 =?utf-8?B?QjNMYkFWbnYyNHFnVFE3djVBUFNCRVVnckppSDdXNjdRTytXeXlRTWg3VzBk?=
 =?utf-8?B?b0tXSGJudEsvdTFzL2xtcFdETWZYcndEZ0tJMndYTlBockFJYWVuZGZpY0lF?=
 =?utf-8?B?T25sOHdzRDVQdVd2Q3d6S1pPKzJoVEdUU0dqNWZJT0Vtdjc2ZldoYmJGQy83?=
 =?utf-8?B?dXdPaThFUlErQUVKbWREYmlZeUVjL2dvZEZHZ0ZLNW5CZGIyQjlwM2VkSTQ4?=
 =?utf-8?B?Yk56a00xdmFEdnBYRkVkellvczc0dzkzZzFMekh5TGNIRllZSE12OHVCWEdk?=
 =?utf-8?B?S256WXlObHFxd0xScDdYeCtiTHovc0JrTVhWNTROeDhTVzcvQm9NbVNIdGlh?=
 =?utf-8?B?akhwR3c0V2FaQlhlRS9YSlliNmk5TTk0ZGJLbnJTV0duUk1oMHNWZXBJdW9W?=
 =?utf-8?B?aHlPSGxKckZleXJWNTYxcTlxbjRoUktqTkU1a1VYVld5Mk1Sd2JlcGpSK3RG?=
 =?utf-8?B?ZDFTeXhzT0tseW9SVkk1WjFNMTZyeDE1OWo3K1Y3Q0htK2JORU1UWjc1bHI1?=
 =?utf-8?B?VHB4dzZzMVZySmtabjVycmU4NnJRaVFFNHBMTDVjSWFRcVNMK0VpYVJ6ZG83?=
 =?utf-8?B?eElRZEJGaXltOXNEQkEwL05kUWlIUVAxNHpBcVV0aFU2S2tJWUxuY1hhcEtL?=
 =?utf-8?B?eFUwMGJKTVJLYXd1RGNGY2lobFNBOGZMRlY5ZCtzTU83bzRySklqMWM1aWVS?=
 =?utf-8?B?b0VhT0NIVDNnRkVrWHJVZGFzdlUvSFJOUkVzamU4MlRDbkdQT3dwdTZ0YWxN?=
 =?utf-8?B?aW0xd3NmMkk2VVZwK1BodWptMVhWbDh3MmtXS2ZCRW5ER2JVQ3d0M0FFbEV0?=
 =?utf-8?B?VkdVdmczaml0WkR0UGp4cCszNWJjL3B4QXNUbGZzVVlyak56R1l6VW1EYkw1?=
 =?utf-8?B?ZUtkU1VWLzB3elR4dHQyZHZGdHc2OXRuY2YraFpqdnVBY05QNGd3UFNmeXp1?=
 =?utf-8?B?L1J3bTFuUUVWaHpoTENkMTNRdks5Zk8zVnJWTHNyTVZaaEVIcEQ1WVQ0eXNK?=
 =?utf-8?B?M2RhNFM4eUE3TjRmUmcwWlF5U25PVnFRSTlVTlVGaW5XZmtBTnpMOXRxTWNp?=
 =?utf-8?B?WVRhOVNNbXUxVmZmQ01LeFlZVjRTcitMZklzRHpSYUhkZlRIbDVMRzNGSEdx?=
 =?utf-8?B?clpyYzBNYWpsZXRzOHFZUDlOL29tSSthMkc0T3hqdEtWOEVSMXR6UUljT0hr?=
 =?utf-8?B?MCt5M0gyVEcyU2FyMGFVRURlS251eDhCVFhMandJS01kUmJySlpDaU9GMGpV?=
 =?utf-8?B?Uk94d3VHNGUwNm1hVTY5THI3YnJRcVViekhEQ0xTKzdKTTVUTUtEcitlR3h0?=
 =?utf-8?B?Q1VuM1hUUWNTT0cveWZ1UDNSQTZuYjhjSkV1eGdYb0FYUER2VXBPZHlUdEw3?=
 =?utf-8?B?dGthQWpxSTBiVm92cFZPdkE1S2pyTUtxa2pBTlpiYmpNSWhPRVN5RXJYUEVN?=
 =?utf-8?B?Tzd2NDg3Q2t2WnUxbDNuYnJXcldxeUZtbnhSbWNLcHdJSGNIRUtqNnpqTFNn?=
 =?utf-8?B?N3ozN3N6dTRZVGpPL0NZai9kclFPMFlQSGVrc3FNTGN1d05kR01QTUVOTm16?=
 =?utf-8?B?djV5NmJhaGRRZlNkSmZFT2cxSlpKNjBieGRYeTJiQXdGVmt5S01UWlEzL3U2?=
 =?utf-8?B?SGMvQTJ1R2dZOUNEenNWdTc4bktrNFh3cFVseUU0bEZ4VjhOWm1pdmc3MlYv?=
 =?utf-8?B?WGdnZUtVTmplbTFmVUR4QVVHSHZzMlVJeXhzTjRmcU5Na3N6czlQbVpZVXZh?=
 =?utf-8?Q?CIhweey8eBy65MKjFr3BiWQ=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 06961663-92f8-4436-e527-08dc18c25bff
X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 07:43:42.7440
 (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: YgyZ4ny1bH2B7C/425u61TV8G9fiopr6az+tY5yVbEj+yBHgxjIEX6b+SKmYvxpiJe1/rybic/wVxEc+go9DnY61x+1Rih9HYJqNkdBOiEY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB6578

Use touch-overlay to support overlay objects such as buttons and a resized
frame defined in the device tree.

If buttons are provided, register an additional device to report key
events separately. A key event will be generated if the coordinates
of a touch event are within the area defined by the button properties.

Signed-off-by: Javier Carrasco <javier.carrasco@wolfvision.net>
---
 drivers/input/touchscreen/st1232.c | 48 +++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index 6475084aee1b..4fa31447dbc1 100644
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -22,6 +22,7 @@
 #include <linux/pm_qos.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/input/touch-overlay.h>
 
 #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;
 };
@@ -138,14 +140,20 @@ static int st1232_ts_parse_and_report(struct st1232_ts_data *ts)
 
 	for (i = 0; i < ts->chip_info->max_fingers; i++) {
 		u8 *buf = &ts->read_buf[i * 4];
+		bool contact = buf[0] & BIT(7);
+		unsigned int x, y;
 
-		if (buf[0] & BIT(7)) {
-			unsigned int x = ((buf[0] & 0x70) << 4) | buf[1];
-			unsigned int y = ((buf[0] & 0x07) << 8) | buf[2];
-
-			touchscreen_set_mt_pos(&pos[n_contacts],
-					       &ts->prop, x, y);
+		if (contact) {
+			x = ((buf[0] & 0x70) << 4) | buf[1];
+			y = ((buf[0] & 0x07) << 8) | buf[2];
+		}
+		if (touch_overlay_process_event(&ts->touch_overlay_list, input,
+						contact ? &x : NULL,
+						contact ? &y : NULL, i))
+			continue;
 
+		if (contact) {
+			touchscreen_set_mt_pos(&pos[n_contacts], &ts->prop, x, y);
 			/* st1232 includes a z-axis / touch strength */
 			if (ts->chip_info->have_z)
 				z[n_contacts] = ts->read_buf[i + 6];
@@ -292,18 +300,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,

-- 
2.39.2