From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Duje Mihanović" <duje.mihanovic@skole.hr>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Sasha Levin" <sashal@kernel.org>,
markuss.broks@gmail.com, linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 47/52] Input: imagis - add touch key support
Date: Fri, 29 Mar 2024 08:45:41 -0400 [thread overview]
Message-ID: <20240329124605.3091273-47-sashal@kernel.org> (raw)
In-Reply-To: <20240329124605.3091273-1-sashal@kernel.org>
From: Duje Mihanović <duje.mihanovic@skole.hr>
[ Upstream commit 2d77f70bb7180060072b9c2406d67e4b3872af15 ]
IST3032C (and possibly some other models) has touch keys. Add support
for them to the imagis driver.
Signed-off-by: Duje Mihanović <duje.mihanovic@skole.hr>
Link: https://lore.kernel.org/r/20240306-b4-imagis-keys-v3-3-2c429afa8420@skole.hr
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/input/touchscreen/imagis.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/imagis.c b/drivers/input/touchscreen/imagis.c
index fecda5cdc482b..fff13114775e0 100644
--- a/drivers/input/touchscreen/imagis.c
+++ b/drivers/input/touchscreen/imagis.c
@@ -34,6 +34,7 @@
#define IST3038C_AREA_MASK GENMASK(27, 24)
#define IST3038C_FINGER_COUNT_MASK GENMASK(15, 12)
#define IST3038C_FINGER_STATUS_MASK GENMASK(9, 0)
+#define IST3032C_KEY_STATUS_MASK GENMASK(20, 16)
struct imagis_properties {
unsigned int interrupt_msg_cmd;
@@ -41,6 +42,7 @@ struct imagis_properties {
unsigned int whoami_cmd;
unsigned int whoami_val;
bool protocol_b;
+ bool touch_keys_supported;
};
struct imagis_ts {
@@ -49,6 +51,8 @@ struct imagis_ts {
struct input_dev *input_dev;
struct touchscreen_properties prop;
struct regulator_bulk_data supplies[2];
+ u32 keycodes[5];
+ int num_keycodes;
};
static int imagis_i2c_read_reg(struct imagis_ts *ts,
@@ -93,7 +97,7 @@ static irqreturn_t imagis_interrupt(int irq, void *dev_id)
{
struct imagis_ts *ts = dev_id;
u32 intr_message, finger_status;
- unsigned int finger_count, finger_pressed;
+ unsigned int finger_count, finger_pressed, key_pressed;
int i;
int error;
@@ -140,6 +144,12 @@ static irqreturn_t imagis_interrupt(int irq, void *dev_id)
FIELD_GET(IST3038C_AREA_MASK, finger_status));
}
+ key_pressed = FIELD_GET(IST3032C_KEY_STATUS_MASK, intr_message);
+
+ for (int i = 0; i < ts->num_keycodes; i++)
+ input_report_key(ts->input_dev, ts->keycodes[i],
+ key_pressed & BIT(i));
+
input_mt_sync_frame(ts->input_dev);
input_sync(ts->input_dev);
@@ -225,6 +235,23 @@ static int imagis_init_input_dev(struct imagis_ts *ts)
input_set_capability(input_dev, EV_ABS, ABS_MT_POSITION_X);
input_set_capability(input_dev, EV_ABS, ABS_MT_POSITION_Y);
input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, 16, 0, 0);
+ if (ts->tdata->touch_keys_supported) {
+ ts->num_keycodes = of_property_read_variable_u32_array(
+ ts->client->dev.of_node, "linux,keycodes",
+ ts->keycodes, 0, ARRAY_SIZE(ts->keycodes));
+ if (ts->num_keycodes <= 0) {
+ ts->keycodes[0] = KEY_APPSELECT;
+ ts->keycodes[1] = KEY_BACK;
+ ts->num_keycodes = 2;
+ }
+
+ input_dev->keycodemax = ts->num_keycodes;
+ input_dev->keycodesize = sizeof(ts->keycodes[0]);
+ input_dev->keycode = ts->keycodes;
+ }
+
+ for (int i = 0; i < ts->num_keycodes; i++)
+ input_set_capability(input_dev, EV_KEY, ts->keycodes[i]);
touchscreen_parse_properties(input_dev, true, &ts->prop);
if (!ts->prop.max_x || !ts->prop.max_y) {
@@ -366,6 +393,7 @@ static const struct imagis_properties imagis_3032c_data = {
.touch_coord_cmd = IST3038C_REG_TOUCH_COORD,
.whoami_cmd = IST3038C_REG_CHIPID,
.whoami_val = IST3032C_WHOAMI,
+ .touch_keys_supported = true,
};
static const struct imagis_properties imagis_3038b_data = {
--
2.43.0
next prev parent reply other threads:[~2024-03-29 12:47 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 12:44 [PATCH AUTOSEL 6.1 01/52] drm/vc4: don't check if plane->state->fb == state->fb Sasha Levin
2024-03-29 12:44 ` [PATCH AUTOSEL 6.1 02/52] Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails Sasha Levin
2024-03-29 12:44 ` [PATCH AUTOSEL 6.1 03/52] drm: panel-orientation-quirks: Add quirk for GPD Win Mini Sasha Levin
2024-03-29 12:44 ` [PATCH AUTOSEL 6.1 04/52] arm64: dts: qcom: sdm630: add USB QMP PHY support Sasha Levin
2024-03-29 13:16 ` Konrad Dybcio
2024-04-08 2:07 ` Sasha Levin
2024-03-29 12:44 ` [PATCH AUTOSEL 6.1 05/52] arm64: dts: qcom: sda660-ifc6560: enable USB 3.0 PHY Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 06/52] pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 07/52] VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 08/52] sysv: don't call sb_bread() with pointers_lock held Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 09/52] quota: Fix potential NULL pointer dereference Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 10/52] scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 11/52] panic: Flush kernel log buffer at the end Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 12/52] isofs: handle CDs with bad root inode but good Joliet root directory Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 13/52] ASoC: Intel: common: DMI remap for rebranded Intel NUC M15 (LAPRC710) laptops Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 14/52] cpuidle: Avoid potential overflow in integer multiplication Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 15/52] arm64: dts: rockchip: fix rk3328 hdmi ports node Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 16/52] arm64: dts: rockchip: fix rk3399 " Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 17/52] rcu-tasks: Repair RCU Tasks Trace quiescence check Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 18/52] Julia Lawall reported this null pointer dereference, this should fix it Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 19/52] media: sta2x11: fix irq handler cast Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 20/52] ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 21/52] firmware: tegra: bpmp: Return directly after a failed kzalloc() in get_filename() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 22/52] ext4: add a hint for block bitmap corrupt state in mb_groups Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 23/52] ext4: forbid commit inconsistent quota data when errors=remount-ro Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 24/52] drm/amd/display: Fix nanosec stat overflow Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 25/52] pstore/zone: Add a null pointer check to the psz_kmsg_read Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 26/52] tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 27/52] drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 28/52] dma-direct: Leak pages on dma_set_decrypted() failure Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 29/52] SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 30/52] Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 31/52] sparc: vdso: Disable UBSAN instrumentation Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 32/52] libperf evlist: Avoid out-of-bounds access Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 33/52] PCI: Mark LSI FW643 to avoid bus reset Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 34/52] cpufreq: Don't unregister cpufreq cooling on CPU hotplug Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 35/52] sh: Fix build with CONFIG_UBSAN=y Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 36/52] input/touchscreen: imagis: Correct the maximum touch area value Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 37/52] input/touchscreen: imagis: Add support for Imagis IST3038B Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 38/52] input/touchscreen: imagis: add support for IST3032C Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 39/52] btrfs: preallocate temporary extent buffer for inode logging when needed Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 40/52] btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 41/52] btrfs: export: handle invalid inode or root reference in btrfs_get_parent() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 42/52] btrfs: send: handle path ref underflow in header iterate_inode_ref() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 43/52] block: prevent division by zero in blk_rq_stat_sum() Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 44/52] RDMA/cm: add timeout to cm_destroy_id wait Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 45/52] Input: make input_class constant Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 46/52] Input: imagis - use FIELD_GET where applicable Sasha Levin
2024-03-29 12:45 ` Sasha Levin [this message]
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 48/52] Input: allocate keycode for Display refresh rate toggle Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 49/52] platform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 50/52] perf/x86/amd/lbr: Discard erroneous branch entries Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 51/52] ktest: force $buildonly = 1 for 'make_warnings_file' test type Sasha Levin
2024-03-29 12:45 ` [PATCH AUTOSEL 6.1 52/52] ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240329124605.3091273-47-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=duje.mihanovic@skole.hr \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markuss.broks@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox