From patchwork Sat May 3 09:08:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaustabh Chakraborty X-Patchwork-Id: 887292 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 985351DDA00; Sat, 3 May 2025 09:08:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746263338; cv=none; b=q/HSlfcuo8w2UzHRofUDvQJbSbRW02Q4G99nODwSyreYKE70+KpdPvUDzTau2LAdcTny9mHq0SfVgB8nV9+rMefpAkX+PUPM1nGzI1NWedzQXtPiSlTRKzDzi3EhgW8X4sX6ErneHRtNTwGgXbSIH0aC1ZfVqeuIJh5bABFx6VM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746263338; c=relaxed/simple; bh=fg5AoTsDiUevWYSsxPAW01tdMPFTPzlekM5HpegsD7U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bv7/AeCzH61HMjFjBq0UGIdeMSyu5wD+CiORlsuo5sNmb7iijBy/RiKpe/Azh9XBWZUfAxjryavX5TLzBS1zRVr383CgOc316C3w46jjS1VsLRR8rmdsJVfbn/VxLkrPmYtZEkUKbRsz2rOscag01QfNQ+h9TKO81aizQghQBoM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org; spf=pass smtp.mailfrom=disroot.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b=LJezFwE4; arc=none smtp.client-ip=178.21.23.139 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=disroot.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b="LJezFwE4" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1EFD925D3B; Sat, 3 May 2025 11:08:53 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id nysnAGpSfo57; Sat, 3 May 2025 11:08:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1746263332; bh=fg5AoTsDiUevWYSsxPAW01tdMPFTPzlekM5HpegsD7U=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LJezFwE4O6zoPwaOTawzSIaz/HsxGpWWkF+Wgr+xblqQWHFDGhlJWOdHRjlPR+pjo yJRi1GBZv+AJFLw221/sdB2mtB6NCI3dZs626WARXVKPDVZuEDVnMtOwdp+J4uPLQT 3RO/yUVKXRAp4hhr+0KMFmHt5g+IGlCR8EAePoIMSQU+bi6xOHwCePGCFSuOJE1QKz 4/qjrk5yG39lKLzre62vR8TXbidzcg50mURH6Ou8K3vMWN/dlNYDJJQzApO5QjtUZT L8dABXxiloh8sSAxgnBWURxwyTANIqukWU94iKpmj2PnLTqkugg1Q9T6hd07vxkZcC Tg2s8Vx7lkD3Q== From: Kaustabh Chakraborty Date: Sat, 03 May 2025 14:38:28 +0530 Subject: [PATCH RFC 2/4] Input: melfas-mip4 - add support for touchkey input events Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250503-mip4-touchkey-v1-2-b483cda29a5b@disroot.org> References: <20250503-mip4-touchkey-v1-0-b483cda29a5b@disroot.org> In-Reply-To: <20250503-mip4-touchkey-v1-0-b483cda29a5b@disroot.org> To: Sangwon Jee , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Kaustabh Chakraborty X-Developer-Signature: v=1; a=ed25519-sha256; t=1746263323; l=3116; i=kauschluss@disroot.org; s=20250202; h=from:subject:message-id; bh=fg5AoTsDiUevWYSsxPAW01tdMPFTPzlekM5HpegsD7U=; b=YCttFFSeRL9zsyyPp/Jogg8qRrgeKuXK9PFKq84ASqzmwPF8C2ofLlxMHoVzTnNz14MEGXz/p Z6Lb0B0Ur/EDhybQwI+JJQ8+cl3T0XuS1CgQQJcWW17Gs4wyBEoOJAG X-Developer-Key: i=kauschluss@disroot.org; a=ed25519; pk=h2xeR+V2I1+GrfDPAhZa3M+NWA0Cnbdkkq1bH3ct1hE= The MIP4 protocol are supposed to support touchscreens, touchkeys, and combo-devices. The driver handles touchscreen events, but touchkey events are unimplemented. Implement them. If compiled with devicetree support, the driver attempts to retrieve keycodes from a property named "linux,keycodes". Signed-off-by: Kaustabh Chakraborty --- drivers/input/touchscreen/melfas_mip4.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchscreen/melfas_mip4.c index a6946e3d8376d7e9b4c26f4194409e0ba78bb075..061ac353bc7a2e28f17581411af81f35c89733a1 100644 --- a/drivers/input/touchscreen/melfas_mip4.c +++ b/drivers/input/touchscreen/melfas_mip4.c @@ -169,7 +169,7 @@ struct mip4_ts { unsigned int event_format; unsigned int key_num; - unsigned short key_code[MIP4_MAX_KEYS]; + unsigned int key_code[MIP4_MAX_KEYS]; bool wake_irq_enabled; @@ -337,8 +337,13 @@ static int mip4_query_device(struct mip4_ts *ts) ts->ppm_x, ts->ppm_y); /* Key ts */ - if (ts->node_key > 0) + if (ts->node_key > MIP4_MAX_KEYS) { + dev_warn(&ts->client->dev, + "Too many keys (%u) found\n", ts->node_key); + ts->key_num = MIP4_MAX_KEYS; + } else { ts->key_num = ts->node_key; + } } /* Protocol */ @@ -1080,6 +1085,7 @@ static int mip4_flash_fw(struct mip4_ts *ts, const u8 *fw_data, u32 fw_size, u32 fw_offset) { struct i2c_client *client = ts->client; + unsigned int i; int offset; u16 buf_addr; int error, error2; @@ -1149,6 +1155,11 @@ static int mip4_flash_fw(struct mip4_ts *ts, input_abs_set_res(ts->input, ABS_X, ts->ppm_x); input_abs_set_res(ts->input, ABS_Y, ts->ppm_y); + for (i = 0; i < ts->key_num; i++) { + if (ts->key_code[i]) + input_set_capability(ts->input, EV_KEY, ts->key_code[i]); + } + return error ? error : 0; } @@ -1425,6 +1436,7 @@ static int mip4_probe(struct i2c_client *client) { struct mip4_ts *ts; struct input_dev *input; + unsigned int i; int error; if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { @@ -1471,6 +1483,17 @@ static int mip4_probe(struct i2c_client *client) input_set_drvdata(input, ts); +#ifdef CONFIG_OF + error = of_property_read_u32_array(client->dev.of_node, "linux,keycodes", + ts->key_code, ts->key_num); + if (error && ts->key_num) { + dev_warn(&client->dev, + "Failed to get codes for %u supported keys", ts->key_num); + /* Disable touchkey support */ + ts->key_num = 0; + } +#endif + input->keycode = ts->key_code; input->keycodesize = sizeof(*ts->key_code); input->keycodemax = ts->key_num; @@ -1491,6 +1514,11 @@ static int mip4_probe(struct i2c_client *client) if (error) return error; + for (i = 0; i < ts->key_num; i++) { + if (ts->key_code[i]) + input_set_capability(input, EV_KEY, ts->key_code[i]); + } + i2c_set_clientdata(client, ts); error = devm_request_threaded_irq(&client->dev, client->irq,