Received-SPF: pass (google.com: domain of linux-kernel+bounces-6588-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Javier Carrasco <javier.carrasco@wolfvision.net>
Date: Wed, 20 Dec 2023 09:39:46 +0100
Subject: [PATCH v6 4/4] Input: st1232 - add touch overlays handling
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230510-feature-ts_virtobj_patch-v6-4-d8a605975153@wolfvision.net>
References: <20230510-feature-ts_virtobj_patch-v6-0-d8a605975153@wolfvision.net>
In-Reply-To: <20230510-feature-ts_virtobj_patch-v6-0-d8a605975153@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>
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?MTlPUzJRMElLL2lIRVRCMTlTQkpEallHUzc5OG9jalVzUS9FZXVWcDA5bUNX?=
 =?utf-8?B?S0s1ZUZ2cHNERHFBVTFhQ2QzZ2hrdE1yMU9WR253UDAxd0diZ1FNWVFFSTRW?=
 =?utf-8?B?TXRMa0RnV3pNZVRrcWUvZTVaUHNZNjR4TEJEM1dDbkpaVFJCQlJ0ckExM0lK?=
 =?utf-8?B?a3Zja08ySUM3VDJpS1ZSbTBoclBDdW43Z1FOUEJXSnczWFZBbTBYTVhKWW5l?=
 =?utf-8?B?VUdYdnhQZThSOTNLOWZUbnFic3NhMVVXV1B2TXUxMGFvWDN5WE9oV1ROa3Uw?=
 =?utf-8?B?WDZzOWY4Q2xUSVhKUGhsaGJmS0RLTVBneWdISFNhNHRrdGxsL1lTcWtZcytl?=
 =?utf-8?B?S3N2TDd3aFRpOHZMY0pSWllGQjRFSU1wMkRSaERocGNvQ3dXblpId251OW5k?=
 =?utf-8?B?WXFXRXpibURCbEFsaHFRMnRIQmlQRHVJdHhhdXlycjBpbWVtSGI5SFNoblpC?=
 =?utf-8?B?eEJ4eU4zU1BHZDVCNU42bjVHQjljeUE0WDdUOW12dVVna21HR0VSSFZ0VVor?=
 =?utf-8?B?M2ZTTTR3Y0NweHFSSTl1Q09FY2Fsc3RHR05iWnV4ZU10T1BVRXIyRnpGak0w?=
 =?utf-8?B?YzBSRTBLdm5DUTR2ay8wYVZlRWZ6MWtiQTJWbUdOdDk4KzRZZ2UrZjFUdzFT?=
 =?utf-8?B?NW1DOXFKZ2tpc29RdHFMbTEyaS95R1p5dzhtZ0oxamNOS2dDYStUTytaelM0?=
 =?utf-8?B?VGgrVldoSXpwVzBTdGQ1c1U5dndtWHgvWHRJZHI3T1FJRDArajlXL2ZUcEVP?=
 =?utf-8?B?aGpPKzNzRlJ6eW95dStJUmIvYno4bE1sZWNUVGFpOHJXcG43VXBuU0RMbW43?=
 =?utf-8?B?SkpJdndFOFc3Q1dyb1RuUnZvbDFxaTY4aXBXZFNqTW5hdjQzUGorSnNKS3JX?=
 =?utf-8?B?WXplQTlLQXUxN0I0WGNWT2hWR25BcFZvenFpaUJ4M29acWZEMTl2ZmtJRXBp?=
 =?utf-8?B?NytCS1hISWdteHJHN0luU0MwOWU4ek5YQk1MaWV6Y2N5d1ZFT2ZlalRwdTJS?=
 =?utf-8?B?WEVPZUtxT0ZHbWQ2bS9jNG1tK3VERlZ0dURURFJtdEUrdE9hYlVoZ0pnR1V2?=
 =?utf-8?B?RlhsNms1OWxVS0lNQjl5RVRRc2JibzBNUE04eEVyalh2NmtnNmUxTFRYcDVU?=
 =?utf-8?B?dEdYR2RBenBXVHF3S3gzSHR1N2d5MzNWTEUycnFaMUQ0NC9hU0VQRjFoa2dl?=
 =?utf-8?B?ZC8yMG1GSWpUL0NlWFVUNEs2QkVuU3hXS2oxTHVvYmpYZW1GTnIrUmlxTzRu?=
 =?utf-8?B?RDhjSjB5UFcxR2hzMG5ISWFXYlc4RkQ5TUlvYkQ3bm94am5mNVNGaE9YMXQ5?=
 =?utf-8?B?NVlJRmJvRkFKa2RqYkV1SUt2cWtiUmhDL091N0VYSDhlV1h4ODVmZm1xS25M?=
 =?utf-8?B?S0JocDVLT1dsT1I2ZGFxdzl5RFl4RDh5aE9MNVV6MFN2Y1lxVzNJVStjVVVY?=
 =?utf-8?B?aktBU2pQZGIzOHk2ZjA2NWNKWlMwQmZyRmR4WEpkcVdWeEcxYytBS2FHcnd1?=
 =?utf-8?B?V2NBZkIyN3F4N0U2TEZJMlFpc2RyWStrcmVBTEQxQnI0aWJtTmloNnZvSnBF?=
 =?utf-8?B?dlE3TnZoS2NhUUtGMWZ5aTFoWW9WZFExWFBQSS9CdXFNTmkxUSttUS9tcVMy?=
 =?utf-8?B?YkxLNHlrdjlXcGYzNEhEUk1lYk83cXN4L2tka1FuTEtVVXBuS1BsNUdCZmlx?=
 =?utf-8?B?NWxrR21tcFBITVRRR1A2M0QzaGxCNDR5VUo4TWhqeElhU2Y5VGk4MW5xUmIx?=
 =?utf-8?B?WTI3Y2RsdlR5NEplSDY0bnBRd01tdVF4YndVbFF4SVNxdXluSUV1UDBrNDBV?=
 =?utf-8?B?NzY4L3Fmc2dwTmJmejFlY0NGLzVIQTc3VG94MWhtd0hYOW9ldGJ2V2gySkMw?=
 =?utf-8?B?SXJLc3I1dW50MEVoTXI0aU1zVjlyeCtNZlErMHJBYXdOZVdQZUhhN3NXS2NN?=
 =?utf-8?B?M0tod053TXhhMnJPRlZxd2VsQmJKTCt4WDVwRUJBTkxhVXkyTk40TzdRa2dT?=
 =?utf-8?B?V01PUDd1MkhheVQwZU9jTDJZbG5GWjN5QWRadjRXSHB2V3lOOFQvVm5yaFdF?=
 =?utf-8?B?OUg3TTFZeE1mbUhqcnNUT25mdWowd0owNGRoSlFITXg2Q2lEdm5YQzNNV3g3?=
 =?utf-8?B?UnpPR2tCc09Ec0FWOUlEcmxBdTVrRzhnREMrWVFWVHE0TWN3amt1dEl4WEpX?=
 =?utf-8?Q?LjTeKSsut4K05QqfMGFjxl0=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: d0292b3c-689f-47fa-c811-08dc01373c46
X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2023 08:39:52.8580
 (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: at+2ijy75fmjHGr/Nh/hNSv0d+LoxXK+4NSAEuuxWHonKorFx9WlYcTWjiUK5sKeR4djj9cQOnKLibkFfmmZgAInSmoRgei3WhejJ6VnHC4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6114

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 | 71 ++++++++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 14 deletions(-)

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index 6475084aee1b..5684cf04bfa1 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"
@@ -56,7 +57,9 @@ struct st1232_ts_data {
 	struct touchscreen_properties prop;
 	struct dev_pm_qos_request low_latency_req;
 	struct gpio_desc *reset_gpio;
+	struct input_dev *overlay_keypad;
 	const struct st_chip_info *chip_info;
+	struct list_head touch_overlay_list;
 	int read_buf_len;
 	u8 *read_buf;
 };
@@ -130,6 +133,7 @@ static int st1232_ts_read_resolution(struct st1232_ts_data *ts, u16 *max_x,
 static int st1232_ts_parse_and_report(struct st1232_ts_data *ts)
 {
 	struct input_dev *input = ts->input_dev;
+	struct input_dev *keypad = ts->overlay_keypad;
 	struct input_mt_pos pos[ST_TS_MAX_FINGERS];
 	u8 z[ST_TS_MAX_FINGERS];
 	int slots[ST_TS_MAX_FINGERS];
@@ -138,14 +142,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, keypad,
+						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];
@@ -226,6 +236,7 @@ static int st1232_ts_probe(struct i2c_client *client)
 	const struct st_chip_info *match;
 	struct st1232_ts_data *ts;
 	struct input_dev *input_dev;
+	struct input_dev *overlay_keypad;
 	u16 max_x, max_y;
 	int error;
 
@@ -263,8 +274,13 @@ static int st1232_ts_probe(struct i2c_client *client)
 	if (!input_dev)
 		return -ENOMEM;
 
+	overlay_keypad = devm_input_allocate_device(&client->dev);
+	if (!overlay_keypad)
+		return -ENOMEM;
+
 	ts->client = client;
 	ts->input_dev = input_dev;
+	ts->overlay_keypad = overlay_keypad;
 
 	ts->reset_gpio = devm_gpiod_get_optional(&client->dev, NULL,
 						 GPIOD_OUT_HIGH);
@@ -286,24 +302,38 @@ static int st1232_ts_probe(struct i2c_client *client)
 
 	input_dev->name = "st1232-touchscreen";
 	input_dev->id.bustype = BUS_I2C;
+	overlay_keypad->name = "st1232-keypad";
+	overlay_keypad->id.bustype = BUS_I2C;
 
 	/* Wait until device is ready */
 	error = st1232_ts_wait_ready(ts);
 	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, ts->overlay_keypad);
+	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,
@@ -335,6 +365,19 @@ static int st1232_ts_probe(struct i2c_client *client)
 		return error;
 	}
 
+	/* Register keypad input device if overlay buttons were defined */
+	if (touch_overlay_mapped_buttons(&ts->touch_overlay_list)) {
+		error = input_register_device(ts->overlay_keypad);
+		if (error) {
+			dev_err(&client->dev,
+				"Unable to register %s input device\n",
+				overlay_keypad->name);
+			return error;
+		}
+	} else {
+		input_free_device(ts->overlay_keypad);
+	}
+
 	i2c_set_clientdata(client, ts);
 
 	return 0;

-- 
2.39.2