Received-SPF: pass (google.com: domain of linux-kernel+bounces-90030-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Sun, 3 Mar 2024 21:43:43 -0600
From: Jeff LaBundy <jeff@labundy.com>
To: Javier Carrasco <javier.carrasco@wolfvision.net>
Cc: 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>,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
	devicetree@vger.kernel.org
Subject: Re: [PATCH v7 4/4] Input: st1232 - add touch overlays handling
Message-ID: <ZeVDb9COXkeOX3s6@nixie71>
References: <20240119-feature-ts_virtobj_patch-v7-0-eda70985808f@wolfvision.net>
 <20240119-feature-ts_virtobj_patch-v7-4-eda70985808f@wolfvision.net>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240119-feature-ts_virtobj_patch-v7-4-eda70985808f@wolfvision.net>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?x79Ira+lCAZr05WK7m7ergNbT70W9oFMPT0vg6nqbJsrspXzCYL/Lj6WlQ50?=
 =?us-ascii?Q?5l+a0WvuTKqyTmy042XVmGwN7aziaN+gkA135LEbT/JZyeE4AGg09PY64Q/G?=
 =?us-ascii?Q?V7cBQFAWWg51hySeiEB6ExyVOGZ4GrVtrVJ4vQAVdhMvB/yA6P5ls1xvY+YV?=
 =?us-ascii?Q?tHUh5KOS0KwVLWIOhq0AUAtP1RomZapBwuEhf50f4TkYoto7Tf7isWwhuNK7?=
 =?us-ascii?Q?94toL34ZT19b4CJtbDZjZCEJhxRrhsKmYDsmxWcbBLK/QA82yI7YGNHA1FtO?=
 =?us-ascii?Q?Y5xGlCQE+9razNUaT6nMgtIWPsXdGjWVhBhtCYpQLLK7878iJ2YjdGb0Y8mw?=
 =?us-ascii?Q?xUzchn6Xiy5rVrzOuX2TJqTmvnkecWctugLKHMU3tPC1bBYYFU3aUmeo0o4b?=
 =?us-ascii?Q?bl/28lLbO2aFwdlSJKUeVlSG94rMLgyF+G/IHqWHjE+LTOGjVyeb/J8FV+Dg?=
 =?us-ascii?Q?9G4mALReycZHwZD+Iq/NBu0ZXmeg7RZf4pjWXjXB/7xQHXtO6w1epZk8gyTg?=
 =?us-ascii?Q?rs/+IKThByeTPmszRNzG/v024WT1u8sWu/Psx3tFD8eYmOW1Eg7nT6+Z5Izd?=
 =?us-ascii?Q?toxW3f1/Xo0wTOlp3fxsqlz5C0vw8fOiame+56iaQzuvRnguKtm6Z9yMvLrL?=
 =?us-ascii?Q?NUl8xMj1Qd2xzF4FhNtgCZabI5nBWLeGBQVmtUXX6Zeup7BvZxr24Myf4PLZ?=
 =?us-ascii?Q?PcgrZJuulXc8H0dDJQLBUlfE/ha84E4N6ySrMQD8j3EoHkqcCVRLmjANlr3m?=
 =?us-ascii?Q?Zr9ylbUIOV7tj4XPzJhjSpkEIFelVVXmmFNFOmPJ68KE6rzTeskxz0fvrO4g?=
 =?us-ascii?Q?x1IbUr497bbW8Zwvttdh1HtTbRCkk8JFLTafiE3TfWuYbFuIOes6EAHFfhiE?=
 =?us-ascii?Q?/2vlD24r8oYFW4BDJ4O+zhj+Gebrr0/YYspEEkKx1KrUUeSfmA/ankYlMKJT?=
 =?us-ascii?Q?QOAOH00YvCbFBz7G/Ltx6HG/N0IIBvPtdtcWUsSgLI8b5+OLWaoznAs8ogmh?=
 =?us-ascii?Q?ZHdfjvt3BYWEu6EeDxjI/vZy79HIeePJRudlv9IU4sAnX6RJzJiQ9bW9UVd4?=
 =?us-ascii?Q?4WICamC+CMuL0NNk8UmKH3ukgZ9PWJXb9Aji4i5dfwQ8XtUeomqHL+mWN6fG?=
 =?us-ascii?Q?VsTckS8q/ZEdpIqFpgJSlBuD6H9l+jy3FOfN7vb/eo0Y1+6H0UpdrYhHvxQo?=
 =?us-ascii?Q?ruPjDo12GHyCqo/bOrbFMBkZl9JlupsfWu+QApZJyBKFKjLIw7pSjHQEUTv8?=
 =?us-ascii?Q?RPf/LwtnucmGT6dNVnXI3koNCrYDAb+YCWRMPlTXlHqVcXv+zgczanGI4PGI?=
 =?us-ascii?Q?Hsq4lxIiPIcmL86/DDnJ9OHlS//FEGNRiIim2Vsfbv9oUbsMoov2noQLbHuU?=
 =?us-ascii?Q?56Iv4XORpDUGBC/Rt8RKvo2+KXBQ7ig4Mmh7Zac5KMJH69IHGEESn6c6wFfd?=
 =?us-ascii?Q?pTsu/ocApNWtfwGFQQRT5kUWvlzkcUfrCU9vd7+zx8AiZ7JzSPdDNWfJwAMC?=
 =?us-ascii?Q?ZciUUl5akx5sfJybRS8kIcWeUOTkxx7WjN8e1Of4mn17TrDfs2RoIotgweu7?=
 =?us-ascii?Q?jEaWyQDJZeKCmNmQ+ACtNI/mZcLFW3t/hFruVYfd?=
X-OriginatorOrg: labundy.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ca521f05-4078-4366-54c2-08dc3bfd4be8
X-MS-Exchange-CrossTenant-AuthSource: SN4PR0801MB3774.namprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 03:43:46.6744
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 00b69d09-acab-4585-aca7-8fb7c6323e6f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ivh0r4osg7WDMS4EovoMwR9cFHFrnePKRVhz0hSaaAgyZFPS0EA4aB0YXEYQcyj+tzAt+KuLLYx/7zh6CXTa6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR08MB8186

Hi Javier,

On Fri, Jan 19, 2024 at 08:43:36AM +0100, Javier Carrasco wrote:
> 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>

Reviewed-by: Jeff LaBundy <jeff@labundy.com>

> ---
>  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
> 

Kind regards,
Jeff LaBundy