Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Javier Carrasco <javier.carrasco@wolfvision.net>
To:     linux-input@vger.kernel.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Dmitry Torokhov <dmitry.torokhov@gmail.com>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Henrik Rydberg <rydberg@bitmath.org>,
        Javier Carrasco <javier.carrasco@wolfvision.net>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        Hans Verkuil <hverkuil-cisco@xs4all.nl>,
        Stephen Boyd <sboyd@kernel.org>,
        Sebastian Reichel <sre@kernel.org>,
        Linus Walleij <linus.walleij@linaro.org>,
        Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Uwe Kleine-g <u.kleine-koenig@pengutronix.de>,
        Bastian Hecht <hechtb@gmail.com>,
        Michael Riesch <michael.riesch@wolfvision.net>
Subject: [RFC v1 3/4] Input: st1232 - add virtual touchscreen and buttons handling
Date:   Tue, 25 Apr 2023 13:50:48 +0200
Message-Id: <20230425115049.870003-4-javier.carrasco@wolfvision.net>
In-Reply-To: <20230425115049.870003-1-javier.carrasco@wolfvision.net>
References: <20230425115049.870003-1-javier.carrasco@wolfvision.net>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WONqWCT7x5/Aw3MVskBH26mEJ6QVH+6irYCBdxk9mAVKz/TkcKcgXTqEokJe?=
 =?us-ascii?Q?NJERVCS2JqGTGQLksfxFvSgr+b9aq6Pv/fIGkNJJfs4nIpIw99KBeUQtyG9D?=
 =?us-ascii?Q?LwXkdQDEnHtWt0hz9gMlUFrldhPLDtQMCceAhRuxxUP6I89QhewlekkH26Dm?=
 =?us-ascii?Q?zEe8qW8aRl1FmK9VnxkP0fDK1CprLhbY9GFFqqMbO32XjhvNROMCLEFyOYOG?=
 =?us-ascii?Q?SRfoHTf0VbHoUjYctM52JOeDYqXdkI9NCo1ARIB17RvY0DWd212LH7b+7/3A?=
 =?us-ascii?Q?PwqFT6n3dxSE8VnHtAvq1DZK8L/Dxar4aYkvYB/V7hSueuuQ0XstVL2Twldl?=
 =?us-ascii?Q?C/vJ8khGnMy5MtarSXKjYBquhUOpYvzONbQspUiF2DF3wh58lsPHZ7Xc3BQl?=
 =?us-ascii?Q?mIBOHkyFkPXe4eBLuZqxpD/Xr8feG3qxbSO4CbwsK4eK/9pKL3fSRr//xxhj?=
 =?us-ascii?Q?TqLzor6StdVxhoSHBbVbNrlSuk8OzF5CyL5MZ8g0H+bcGbxkpNgd7oGxI2Wb?=
 =?us-ascii?Q?q350/2o6JjCT9nq1bKrIHe3ITmbFNlvG/PSjjYrktnTvmWKG2uTmQ0PbYB4i?=
 =?us-ascii?Q?RHaUyBOx3cQ3BUC0Pb7JhqEPcUjW6fRlf4bUi/qpPt95VzOOamONvV5CkjnJ?=
 =?us-ascii?Q?mESzo9d3uKMFnaXGcrafyLtN2e9lkL3yh3OUhG1GQ9qaWuClB8W3QYIAhUW8?=
 =?us-ascii?Q?Jn3BXGfh0DfG4m2Dd/BqZvGHFR2gWXzGBFT0M4nlWidYMLTNDk36tl3keGwg?=
 =?us-ascii?Q?ZAj/eVLX5A1cWFwV40Jcw+1pyNFejapPPHFz0wNX6NksyqT7wKtHWJCIebcI?=
 =?us-ascii?Q?4K6QBgz8pkoZdbVDdOjqWILUBOz/aA+u+PHjA+48nSYMvIk0iKHL3LHSnLE/?=
 =?us-ascii?Q?urvFuuxcUASQffk8FQ6tUlWNuiQ+u6j8zw6kelR0Ze/rSwu3LqW2LCGHJKOy?=
 =?us-ascii?Q?PjmeQrgYfFh0UwL2/luMzgYhNnse+pWLX3YetAuTgXm52ZafJ8/FvgOOkbeI?=
 =?us-ascii?Q?G/pyYYVGbEPAiKgouSnQV+iXakqP/rmZLT/wua+46snoJT8pL1ffYO8Sf33i?=
 =?us-ascii?Q?TsW49ep/u0tX/MRreUoc/cPblutR3QoxfMZu1vsD8gVgs+2Z2bzR5VCMVz8K?=
 =?us-ascii?Q?UTimHqhe5dHh3ebNwaQSEc7ialfoIHdv/4nyOlYROO0WNaaXJQYfuEypDGuQ?=
 =?us-ascii?Q?DfiTEqdsOJNzd+k6WblVb0vFvWIIUdBK5kRWhcDuVkOmJDa/qBoNP/+m5hY4?=
 =?us-ascii?Q?O9LSNwbXDPzmUxzF5U3jyUVGWfcE/yhvI1PEo1Repjqh98TwkVExCoohkiAj?=
 =?us-ascii?Q?+PtogVa/IZrzMN8zOwgch6UXDPUOiSgizHYdrWQlKWCChKletaIvuBQtZT1p?=
 =?us-ascii?Q?t4Xql7AA/c9yJBvKe+AZz0SKGm3CqdcSqB+ssRE3m34/XyL4Tg93/3S0jKeG?=
 =?us-ascii?Q?f182WfbfolhK7K/t+brGOC5kZZwlpZyy/0qglg17jOHxiSJnu+VsMItrlSzQ?=
 =?us-ascii?Q?3xyJzaPM6CgEsXCMcKYVCquq5rqVCjNe1JKfsSjBVV7UqSd8XGqwPYidI7iE?=
 =?us-ascii?Q?qZHQUktgY4wcvB9o3rWZ2M/2p6NAohfz5wU6dYqOEyfsFl8sT+0xUSuUWNyT?=
 =?us-ascii?Q?le7WE6FGtcn1ZttSi+oZQEM=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: f22e31cf-818c-4348-fb95-08db458364a3
X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 11:51:23.6379
 (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: /dTTTY1WKRDG9nCD9S7+VpPmJyGoAr+b6p0Yk7dSkK3vgyVmSrKCxmxVxFcnF8Dm/POb/orhAGIYWI1X96EpsrsgDqJFb9K/Dg5EI8bVmTU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB10203
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use ts-virtobj to support overlay objects such as buttons and resized
frames defined in the device tree.

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

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index f49566dc96f8..025f43c532d8 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/ts-virtobj.h>
 
 #define ST1232_TS_NAME	"st1232-ts"
 #define ST1633_TS_NAME	"st1633-ts"
@@ -56,6 +57,7 @@ struct st1232_ts_data {
 	struct touchscreen_properties prop;
 	struct dev_pm_qos_request low_latency_req;
 	struct gpio_desc *reset_gpio;
+	struct ts_virtobj_map *map;
 	const struct st_chip_info *chip_info;
 	int read_buf_len;
 	u8 *read_buf;
@@ -133,6 +135,7 @@ static int st1232_ts_parse_and_report(struct st1232_ts_data *ts)
 	struct input_mt_pos pos[ST_TS_MAX_FINGERS];
 	u8 z[ST_TS_MAX_FINGERS];
 	int slots[ST_TS_MAX_FINGERS];
+	bool button_slot[ST_TS_MAX_FINGERS] = {false};
 	int n_contacts = 0;
 	int i;
 
@@ -143,6 +146,11 @@ static int st1232_ts_parse_and_report(struct st1232_ts_data *ts)
 			unsigned int x = ((buf[0] & 0x70) << 4) | buf[1];
 			unsigned int y = ((buf[0] & 0x07) << 8) | buf[2];
 
+			if (ts_virtobj_button_event(ts->map, ts->input_dev, x, y))
+				button_slot[n_contacts] = true;
+			else if (!ts_virtobj_mt_on_touchscreen(ts->map, &x, &y))
+				continue;
+
 			touchscreen_set_mt_pos(&pos[n_contacts],
 					       &ts->prop, x, y);
 
@@ -158,12 +166,16 @@ static int st1232_ts_parse_and_report(struct st1232_ts_data *ts)
 	for (i = 0; i < n_contacts; i++) {
 		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);
-		input_report_abs(input, ABS_MT_POSITION_Y, pos[i].y);
+		if (!button_slot[i]) {
+			input_report_abs(input, ABS_MT_POSITION_X, pos[i].x);
+			input_report_abs(input, ABS_MT_POSITION_Y, pos[i].y);
+		}
 		if (ts->chip_info->have_z)
 			input_report_abs(input, ABS_MT_TOUCH_MAJOR, z[i]);
 	}
 
+	if (!n_contacts)
+		ts_virtobj_button_release_pressed(ts->map, ts->input_dev);
 	input_mt_sync_frame(input);
 	input_sync(input);
 
@@ -266,6 +278,11 @@ static int st1232_ts_probe(struct i2c_client *client)
 	ts->client = client;
 	ts->input_dev = input_dev;
 
+	/* map virtual objects if defined in the device tree */
+	ts->map = ts_virtobj_map_objects(&ts->client->dev, ts->input_dev);
+	if (IS_ERR(ts->map))
+		return PTR_ERR(ts->map);
+
 	ts->reset_gpio = devm_gpiod_get_optional(&client->dev, NULL,
 						 GPIOD_OUT_HIGH);
 	if (IS_ERR(ts->reset_gpio)) {
@@ -292,18 +309,22 @@ 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);
 
+	if (ts_virtobj_mapped_touchscreen(ts->map)) {
+		ts_virtobj_retrieve_abs(ts->map, &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.37.2