From patchwork Mon Mar 31 21:11:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Heiny X-Patchwork-Id: 3917891 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7DFC9BF540 for ; Mon, 31 Mar 2014 21:11:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E333203AF for ; Mon, 31 Mar 2014 21:11:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A45E203AE for ; Mon, 31 Mar 2014 21:11:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751081AbaCaVLS (ORCPT ); Mon, 31 Mar 2014 17:11:18 -0400 Received: from us-mx2.synaptics.com ([192.147.44.131]:42348 "EHLO us-mx2.synaptics.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751035AbaCaVLR (ORCPT ); Mon, 31 Mar 2014 17:11:17 -0400 Received: from unknown (HELO securemail.synaptics.com) ([172.20.21.135]) by us-mx2.synaptics.com with ESMTP; 31 Mar 2014 14:11:18 -0700 Received: from USW-OWA1.synaptics-inc.local ([10.20.24.16]) by securemail.synaptics.com (PGP Universal service); Mon, 31 Mar 2014 13:55:56 -0700 X-PGP-Universal: processed; by securemail.synaptics.com on Mon, 31 Mar 2014 13:55:56 -0700 Received: from brontomerus.synaptics.com (10.3.20.103) by USW-OWA1.synaptics-inc.local (10.20.24.15) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 31 Mar 2014 14:11:16 -0700 From: Christopher Heiny To: Dmitry Torokhov CC: Linux Input , Christopher Heiny , Andrew Duggan , Vincent Huang , Vivian Ly , Linus Walleij , Benjamin Tissoires , David Herrmann , Jiri Kosina Subject: [PATCH v2 3/3] Input: synaptics-rmi4 - report sensor resolution Date: Mon, 31 Mar 2014 14:11:07 -0700 Message-ID: <1396300267-5108-3-git-send-email-cheiny@synaptics.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1396300267-5108-1-git-send-email-cheiny@synaptics.com> References: <1396300267-5108-1-git-send-email-cheiny@synaptics.com> MIME-Version: 1.0 X-Originating-IP: [10.3.20.103] Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reports the sensor resolution by reading the size of the sensor from F11 query registers or from the platform data if the firmware does not contain the appropriate query registers. Signed-off-by: Andrew Duggan Acked-by: Christopher Heiny Cc: Dmitry Torokhov Cc: Benjamin Tissoires Cc: Linux Walleij Cc: David Herrmann Cc: Jiri Kosina Reviewed-by: Benjamin Tissoires --- drivers/input/rmi4/rmi_f11.c | 43 ++++++++++++++++++++++++++++++++++++++++++- include/linux/rmi.h | 2 ++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c index ee47b7e..9c682f0 100644 --- a/drivers/input/rmi4/rmi_f11.c +++ b/drivers/input/rmi4/rmi_f11.c @@ -408,6 +408,10 @@ struct f11_2d_sensor_queries { u8 clickpad_props; u8 mouse_buttons; bool has_advanced_gestures; + + /* Query 15 - 18 */ + u16 x_sensor_size_mm; + u16 y_sensor_size_mm; }; /* Defs for Ctrl0. */ @@ -518,6 +522,8 @@ struct f11_2d_sensor { char input_phys[NAME_BUFFER_SIZE]; u8 report_abs; u8 report_rel; + u8 x_mm; + u8 y_mm; }; /** Data pertaining to F11 in general. For per-sensor data, see struct @@ -1064,7 +1070,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, query_size++; } - if (f11->has_query12 && sensor_query->has_info2) { + if (sensor_query->has_info2) { rc = rmi_read(rmi_dev, query_base_addr + query_size, query_buf); if (rc < 0) return rc; @@ -1085,6 +1091,20 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, query_size++; } + if (sensor_query->has_physical_props) { + rc = rmi_read_block(rmi_dev, query_base_addr + + query_size, query_buf, 4); + if (rc < 0) + return rc; + + sensor_query->x_sensor_size_mm = + (query_buf[0] | (query_buf[1] << 8)) / 10; + sensor_query->y_sensor_size_mm = + (query_buf[2] | (query_buf[3] << 8)) / 10; + + query_size += 4; + } + return query_size; } @@ -1106,6 +1126,7 @@ static void f11_set_abs_params(struct rmi_function *fn, struct f11_data *f11) ((f11->dev_controls.ctrl0_9[9] & 0x0F) << 8); u16 x_min, x_max, y_min, y_max; unsigned int input_flags; + int res_x, res_y; /* We assume touchscreen unless demonstrably a touchpad or specified * as a touchpad in the platform data @@ -1156,6 +1177,18 @@ static void f11_set_abs_params(struct rmi_function *fn, struct f11_data *f11) x_min, x_max, 0, 0); input_set_abs_params(input, ABS_MT_POSITION_Y, y_min, y_max, 0, 0); + + if (sensor->x_mm && sensor->y_mm) { + res_x = (x_max - x_min) / sensor->x_mm; + res_y = (y_max - y_min) / sensor->y_mm; + + input_abs_set_res(input, ABS_X, res_x); + input_abs_set_res(input, ABS_Y, res_y); + + input_abs_set_res(input, ABS_MT_POSITION_X, res_x); + input_abs_set_res(input, ABS_MT_POSITION_Y, res_y); + } + if (!sensor->type_a) input_mt_init_slots(input, sensor->nbr_fingers, input_flags); if (IS_ENABLED(CONFIG_RMI4_F11_PEN) && sensor->sens_query.has_pen) @@ -1252,6 +1285,14 @@ static int rmi_f11_initialize(struct rmi_function *fn) pdata->f11_sensor_data->axis_align; sensor->type_a = pdata->f11_sensor_data->type_a; + if (sensor->sens_query.has_physical_props) { + sensor->x_mm = sensor->sens_query.x_sensor_size_mm; + sensor->y_mm = sensor->sens_query.y_sensor_size_mm; + } else if (pdata->f11_sensor_data) { + sensor->x_mm = pdata->f11_sensor_data->x_mm; + sensor->y_mm = pdata->f11_sensor_data->y_mm; + } + if (sensor->sensor_type == rmi_f11_sensor_default) sensor->sensor_type = pdata->f11_sensor_data->sensor_type; diff --git a/include/linux/rmi.h b/include/linux/rmi.h index 164b813..ca35b2f 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -95,6 +95,8 @@ struct rmi_f11_sensor_data { struct rmi_f11_2d_axis_alignment axis_align; bool type_a; enum rmi_f11_sensor_type sensor_type; + int x_mm; + int y_mm; int disable_report_mask; };