@@ -64,6 +64,7 @@ struct icn8318_data {
struct gpio_desc *wake_gpio;
struct touchscreen_properties prop;
enum icn8318_model model;
+ int softbutton;
};
static int icn8318_read_touch_data(struct icn8318_data *data,
@@ -122,15 +123,9 @@ static irqreturn_t icn8318_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
- if (touch_data.softbutton) {
- /*
- * Other data is invalid when a softbutton is pressed.
- * This needs some extra devicetree bindings to map the icn8318
- * softbutton codes to evdev codes. Currently no known devices
- * use this.
- */
- return IRQ_HANDLED;
- }
+ if (data->softbutton)
+ input_report_key(data->input, data->softbutton,
+ touch_data.softbutton == 0x01);
if (touch_data.touch_count > ICN8318_MAX_TOUCHES) {
dev_warn(dev, "Too much touches %d > %d\n",
@@ -268,6 +263,7 @@ static int icn8318_probe_acpi(struct icn8318_data *data, struct device *dev)
if (strcmp(sub, "HAMP0002") == 0) {
input_set_abs_params(input, ABS_MT_POSITION_X, 0, 1199, 0, 0);
input_set_abs_params(input, ABS_MT_POSITION_Y, 0, 1919, 0, 0);
+ data->softbutton = KEY_LEFTMETA;
} else {
dev_err(dev, "Unknown model _SUB: %s\n", sub);
kfree(buf.pointer);
@@ -339,6 +335,9 @@ static int icn8318_probe(struct i2c_client *client)
return -EINVAL;
}
+ if (data->softbutton)
+ input_set_capability(data->input, EV_KEY, data->softbutton);
+
error = input_mt_init_slots(input, ICN8318_MAX_TOUCHES,
INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);
if (error)
Some x86 tablets with an icn8505 touchscreen have a capacative home button, add support for this. Note that it turns out the removed comment turns out to be inaccurate, yes when the capacative home button is pressed the touch info contains invalid data, but touch_count is set to 0 so this is not a problem and if both the button is used and a finger is touching the normal touchscreen area then there is valid touch data. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/input/touchscreen/chipone_icn8318.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)