From patchwork Fri Jan 19 07:43:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 13523391 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2043.outbound.protection.outlook.com [40.107.14.43]) (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 93A0028E1E; Fri, 19 Jan 2024 07:43:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.14.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705650233; cv=fail; b=nYaPyD1Gq9+XotbgxiZOcKVKrIvTx1nxmLX/TygUkzX3JZbW9cwouwlhv5heUVNGj1snBgEfsS+r73/PshcCtHwy2otDXlVoLt7uSYLAweWUyKvE3pfWjAapxTuWjtZeZpaQRAOD5hvsnZnzQfCkG6dpEKurre27nzv6jWDBDvw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705650233; c=relaxed/simple; bh=8ZCwLODssVe58IJ/RKNeTtBq1x6Smnd905NV4m4CNXo=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=LKX9gFikdqWGJA5m6WUIwvY12dNhnYw0XV8xWch8KCcUFwyWW42lRqY7xCUc+uYDwAuC1Vl2ZPgTA6uHT8mYOBgcTbHlLzX/wzi9/cPJ7MLYS5D0GzRE068jynELYEIhqVCXVwQLVowRJ1V42W+Ip2/SyX4/AxrjZRhGuAtN4JM= 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=p1Q/n2Nw; arc=fail smtp.client-ip=40.107.14.43 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="p1Q/n2Nw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JZO4KRyQYt9UsfjEQOpWLTxlolaDJk+6LPI48UH8JdMiYwxfxnQOuNoSpZdh/EXw2E6/rfg5zt3qfwziQMCj1oGSbJbnBdEmdY33hpqXoFwX67QbyA3YrEXI3P6ydIf55Jk4kU1g84CUZSVdCmxLtYrekr/yNifKPE96CKaamkgbT+lIpkkhZISADJdtup06qRCTlnyIlgb9VF9TYMfN/iEu7YzYaHyrBiv5Fow08EDjY2b4JoXAhiI0gPWWC7Fq6GRPzzD5vmCxwDzXQ6y8Oaa+jf8zcs9Rto8q1x+I+6kGZZqsYGAChtROKlzkwqIVcgPiZEZyQYgHhvap6n6gXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=j/pOwDYwfpSMY0Ty5wfbusqYghdBkhPgGizdIHn9Z6w=; b=Dx9xNJwVo3qmIrK6+ZYP2PNgLS1QP7o1tXgfVR9KTi38CwiZliN74TlK0vQg3q9hUt/AXbxpdUA5ZKDpQ4htKhkBgSYwwRE7Rc7fzuYzgSxVJKZbBxYYfhQHQl7yP96Sywr6gn3L4uegh9FvxdcOTlzIaVBEJrwK0LGqWWHLh5BRFkjrVFS5BKbQ2moZ/610Iui5FZgueTpRpniBM+ojfhOYnCXw7AKVV88UW2MuX7daVNuYOaYTBDGnD5z9R36z4mjDRo0YqpZsz52rPBGBbk2puR9qty6dUcBRmZi+LIIYmB2NANgXG6/G7pQJRCJDtY96NJYzUxJGsO1bkEv3hA== 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=j/pOwDYwfpSMY0Ty5wfbusqYghdBkhPgGizdIHn9Z6w=; b=p1Q/n2NwDqoSR0pm21selj1nq69jAfUW/uE9G8pVB3NO214f7Ah19ww3geN/aPJdLYvPTmgXPP9Xo8CNH0gotfekK+cys/GdiGqHLdSN5EpUeYzMq4LLU6o48KWvFLW64LcMAlHEISLavPRiuKhi2c3tQPlSulQCtPyr921pKnE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) by AM8PR08MB6578.eurprd08.prod.outlook.com (2603:10a6:20b:36a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 07:43:42 +0000 Received: from VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::c8ee:9414:a0c6:42ab]) by VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::c8ee:9414:a0c6:42ab%6]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 07:43:42 +0000 From: Javier Carrasco Date: Fri, 19 Jan 2024 08:43:36 +0100 Subject: [PATCH v7 4/4] Input: st1232 - add touch overlays handling 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 , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg , Bastian Hecht , Michael Riesch , Jeff LaBundy Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, devicetree@vger.kernel.org, Javier Carrasco X-Mailer: b4 0.13-dev-4e032 X-Developer-Signature: v=1; a=ed25519-sha256; t=1705650218; l=3410; i=javier.carrasco@wolfvision.net; s=20230509; h=from:subject:message-id; bh=8ZCwLODssVe58IJ/RKNeTtBq1x6Smnd905NV4m4CNXo=; b=Bsze/vswBYZq/N3RY5sCRFd4ol6ZvkcCTPlWeRyxFygRvOKtuzVQaiBnM8SJSibUnIuqfajT1 8MiWN5CSpioBojsvsS8eA1EO2LNxetHQaweU05XQs2pCaeq7CDMrrmb X-Developer-Key: i=javier.carrasco@wolfvision.net; a=ed25519; pk=tIGJV7M+tCizagNijF0eGMBGcOsPD+0cWGfKjl4h6K8= X-ClientProxiedBy: VI1PR0102CA0088.eurprd01.prod.exchangelabs.com (2603:10a6:803:15::29) To VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) 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: VE1PR08MB4974:EE_|AM8PR08MB6578:EE_ X-MS-Office365-Filtering-Correlation-Id: 06961663-92f8-4436-e527-08dc18c25bff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6iGXlA1Tb/fKoxAFHsvQ63bmCzpO4JXC8ZlZS7GQLEkN2CJmLjyAUJwXIc1AVIUbMGPU8wd13ZP5YrzwKUqv1Q+DreHTcavnRkgpe9yH4oS/QN3mrWIIoft6ihxexxwVioa0Et/VenvUkDebABzUv2CMkmvaPIbCbl2qHhTZ+edlge7udIZQRuvUcE/6rT05peQ9ZPcJnANqaLaNAmaqpjT19QIc1tWXbl1vzP0IWMrAEloE4uK7BxD5ijY6NrkF9CSocIiAFpdMpr+6JsDw4TgYZAeDW/Qf/z4KOywLmanevjpeV9jWD47rA1HQS0euU+N+o50H+exuWmN86TamOxt1osg/9VMV5sh67hZSC0y5sth6jXC8AEXVXdj/I91SRZlSvKHqS+oq6fwxTbreihgwysFTj+GenUVh1h8T5SdRzGsOnSkjK9Fz1iXYzZGM7Fw6T0DAskvRe7W89AarSeoew+L8dbL7bijoXBbXKYasyt2HBrs/g8qkjFVrKWhJPSJ11hhFW7hrKaSISu/mqxwcQCxP1P0nH5OfvObsEeoMdAt5b+N5VIAwM5M8mCI+k+d098AS8BuOHzTANJiJV34up7Bal5p8tiDiudqG3kbKRtNxqH1fYB81DJZkKAA8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR08MB4974.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(376002)(396003)(346002)(39850400004)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(2906002)(7416002)(4326008)(5660300002)(41300700001)(86362001)(38100700002)(478600001)(6486002)(36756003)(107886003)(83380400001)(2616005)(6666004)(6506007)(6512007)(26005)(52116002)(316002)(8936002)(8676002)(44832011)(38350700005)(110136005)(66946007)(66556008)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?U0LoFJ10tTt3Ro4vnvPnIRJRLGT+?= =?utf-8?q?nssP+HYtyLwSwkcf8sHAJQMkQua90G5ts7ztOy4eGAYMZrsCz31lUbz7n6fO0I420?= =?utf-8?q?XKzLPCXUDUy00flH7xD9cfliN6VLpMiUU3CsPPU/ECSnQ0zLPtfehpeNwg7wNhzKS?= =?utf-8?q?x/TnkNa3xxTCIbC2aH8xcXSReuzEXxYatU7p47Rm8GjFYfhr4BFS6nlQ7N++9QNeC?= =?utf-8?q?GG2DXHQBgogRnH1Hm4Ws0QZ+wGVVmwrVieb8ycrEcBdRkPpBb7oynsLWV6eJnRA9b?= =?utf-8?q?cORiKSZnF1MVd+gGansEXUwYAMQB3LbAVnv24qgTQ7v5APSBEUgrJiH7W67QO+Wyy?= =?utf-8?q?QMh7W0doKWHbntK/u1s/lmpWDMfXrwDgKI2wXNPhrAIaendficIEOnl8wsD5PuWvC?= =?utf-8?q?wzKZO+2hTGTSGj5fIOEmv76fWhbbFC/7uwOi8ERQ+AEJmdDbiYyEc/godFGgFK5nB?= =?utf-8?q?db2B9p3edI48bNzkM1vaDvpXFEdzYos74w93g1LzHyLcHFYYHMv8uBXGdKnzYyNlq?= =?utf-8?q?qwLRp7Xx+bLz/sBkMXV54Nx8SW7/BoMmSHtiajHpGw4WaZBXeE/XJYb6i9M94dbKn?= =?utf-8?q?rSWGnRMh0sVepIuoVhyOHlJrFeyrV561q9qn4hRKjNE5kUXVWy2MRwbepjR+tFd1S?= =?utf-8?q?yxsOKlyoRVI5Z1M16rx159j7+V7CHm+bNEMTZ75lr5Tpxw6s1VrJkZn5rre86rQiQ?= =?utf-8?q?E4pLL5cIaQqSL+EiaRzdo7xIQdBFiym9sDBA0/NdQiHQP14zAqUthU6KkIYLncXap?= =?utf-8?q?KKxU00bJMRKawuDcFcihlSA8fLFV9d+sMO7o4rJIj1c5ieRoEaOCHT3gFEkXrUdas?= =?utf-8?q?vU/HRNREsje82TCnGPOwpu6talMim1wsf2I6UVp+Phujm1XVl8w2kWKfBEnDGbUCw?= =?utf-8?q?t3AElEtVGUvg3jitZDtPjxp+35bc/pxAsTlfsUYrjNzGYzUmDbL5eKdSUV/0wzTxt?= =?utf-8?q?t2dvFtw69tncf+hZjvuAcNP4gwPSfyzu/Rwm1nQEVhzhLCd13QvK9fO3VrVLsrMVZ?= =?utf-8?q?hEHpD5YT4ysJ3da4S8yA7N4fRg0ZQySnOVqQI9UNUFinWfkANzL9tqMciYTa9SMmu?= =?utf-8?q?1VffCMKxYYV4Sr+LfIsDzRaHdfTHl5LG3FHGqrZrc0Majlets8qYP9N/omI+a2G4O?= =?utf-8?q?xjtKV8ER1tzQIcOHk0+y3H2TG2Sar0aUEDeKnux8BTXLjwIKMdRbrJZCiOF0jUROx?= =?utf-8?q?wuG4e06maU69Lr7brQqUbzHDCLS+7JM5TMKDr+eGxtCUn3XTQcSOG/yfuP3RA6nb8?= =?utf-8?q?cJEuxgXoAXPDvUpOdyTtL7tkaAjqI0bVovpVOvA5KjrMKqkjANZbbjMIhOESyErXP?= =?utf-8?q?EMO7v487CkvZu1l3nbrWrWqyFmnxRmcKpwIHcHEKj6zjLSg7z37szu4YTjO/CYj/d?= =?utf-8?q?rQO0YPHeksqMLcuwNdGMPMENNmzv5y6bahdQfSdJfEOg1JZJ60bxdXy2bAwFVkyKM?= =?utf-8?q?TZQ3/u6Hc/A2uGgY9CDzsVu78nKk4XwpUlyE4lFxV8NZmivg72V/XggeKUNjem1fU?= =?utf-8?q?DxAUGHvs2UIyxsN4fqNMkszs9PmZYUvaCIhweey8eBy65MKjFr3BiWQ=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 Reviewed-by: Jeff LaBundy --- 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 #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; }; @@ -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,