Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbcKIAvq (ORCPT ); Tue, 8 Nov 2016 19:51:46 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36307 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751977AbcKIAvo (ORCPT ); Tue, 8 Nov 2016 19:51:44 -0500 Date: Tue, 8 Nov 2016 16:51:40 -0800 From: Dmitry Torokhov To: Benjamin Tissoires Cc: Andrew Duggan , Lyude Paul , Christopher Heiny , Nick Dyer , Bjorn Andersson , Dennis Wassenberg , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: Re: [PATCH v3 04/18] Input: synaptics-rmi4 - Add parameters for dribble packets and palm detect gesture Message-ID: <20161109005140.GI8719@dtor-ws> References: <1476373872-18027-1-git-send-email-benjamin.tissoires@redhat.com> <1476373872-18027-5-git-send-email-benjamin.tissoires@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1476373872-18027-5-git-send-email-benjamin.tissoires@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5300 Lines: 173 On Thu, Oct 13, 2016 at 05:50:58PM +0200, Benjamin Tissoires wrote: > From: Andrew Duggan > > The rmi_f11 driver currently disables dribble packets and the palm detect > gesture for all devices. This patch creates a parameter in the 2d sensor > platform data for controlling this functionality on a per device basis. > > For more information on dribble packets: > Commit 05ba999fcabb ("HID: rmi: disable dribble packets on Synaptics > touchpads") > > For more information on the palm detect gesture: > Commit f097deef59a6 ("HID: rmi: disable palm detect gesture when present") > > Signed-off-by: Andrew Duggan > Reviewed-by: Benjamin Tissoires > Signed-off-by: Benjamin Tissoires Applied, thank you. > > --- > > new in v3 > --- > drivers/input/rmi4/rmi_2d_sensor.h | 2 ++ > drivers/input/rmi4/rmi_f01.c | 6 +++--- > drivers/input/rmi4/rmi_f11.c | 32 ++++++++++++++++++++++++++++---- > include/linux/rmi.h | 21 +++++++++++++-------- > 4 files changed, 46 insertions(+), 15 deletions(-) > > diff --git a/drivers/input/rmi4/rmi_2d_sensor.h b/drivers/input/rmi4/rmi_2d_sensor.h > index 77fcdfe..c871bef 100644 > --- a/drivers/input/rmi4/rmi_2d_sensor.h > +++ b/drivers/input/rmi4/rmi_2d_sensor.h > @@ -67,6 +67,8 @@ struct rmi_2d_sensor { > u8 report_rel; > u8 x_mm; > u8 y_mm; > + enum rmi_reg_state dribble; > + enum rmi_reg_state palm_detect; > }; > > int rmi_2d_sensor_of_probe(struct device *dev, > diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c > index fac81fc..2cfa9f6 100644 > --- a/drivers/input/rmi4/rmi_f01.c > +++ b/drivers/input/rmi4/rmi_f01.c > @@ -327,12 +327,12 @@ static int rmi_f01_probe(struct rmi_function *fn) > } > > switch (pdata->power_management.nosleep) { > - case RMI_F01_NOSLEEP_DEFAULT: > + case RMI_REG_STATE_DEFAULT: > break; > - case RMI_F01_NOSLEEP_OFF: > + case RMI_REG_STATE_OFF: > f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT; > break; > - case RMI_F01_NOSLEEP_ON: > + case RMI_REG_STATE_ON: > f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT; > break; > } > diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c > index 3218742..cce82a1 100644 > --- a/drivers/input/rmi4/rmi_f11.c > +++ b/drivers/input/rmi4/rmi_f11.c > @@ -1142,6 +1142,8 @@ static int rmi_f11_initialize(struct rmi_function *fn) > sensor->topbuttonpad = f11->sensor_pdata.topbuttonpad; > sensor->kernel_tracking = f11->sensor_pdata.kernel_tracking; > sensor->dmax = f11->sensor_pdata.dmax; > + sensor->dribble = f11->sensor_pdata.dribble; > + sensor->palm_detect = f11->sensor_pdata.palm_detect; > > if (f11->sens_query.has_physical_props) { > sensor->x_mm = f11->sens_query.x_sensor_size_mm; > @@ -1209,11 +1211,33 @@ static int rmi_f11_initialize(struct rmi_function *fn) > ctrl->ctrl0_11[RMI_F11_DELTA_Y_THRESHOLD] = > sensor->axis_align.delta_y_threshold; > > - if (f11->sens_query.has_dribble) > - ctrl->ctrl0_11[0] = ctrl->ctrl0_11[0] & ~BIT(6); > + if (f11->sens_query.has_dribble) { > + switch (sensor->dribble) { > + case RMI_REG_STATE_OFF: > + ctrl->ctrl0_11[0] = ctrl->ctrl0_11[0] & ~BIT(6); Changed to ctrl->ctrl0_11[0] &= ~BIT(6); > + break; > + case RMI_REG_STATE_ON: > + ctrl->ctrl0_11[0] = ctrl->ctrl0_11[0] | BIT(6); > + break; > + case RMI_REG_STATE_DEFAULT: > + default: > + break; > + } > + } > > - if (f11->sens_query.has_palm_det) > - ctrl->ctrl0_11[11] = ctrl->ctrl0_11[11] & ~BIT(0); > + if (f11->sens_query.has_palm_det) { > + switch (sensor->palm_detect) { > + case RMI_REG_STATE_OFF: > + ctrl->ctrl0_11[11] = ctrl->ctrl0_11[11] & ~BIT(0); > + break; > + case RMI_REG_STATE_ON: > + ctrl->ctrl0_11[11] = ctrl->ctrl0_11[11] & BIT(0); > + break; > + case RMI_REG_STATE_DEFAULT: > + default: > + break; > + } > + } > > rc = f11_write_control_regs(fn, &f11->sens_query, > &f11->dev_controls, fn->fd.query_base_addr); > diff --git a/include/linux/rmi.h b/include/linux/rmi.h > index 5944e6c..ac904bb 100644 > --- a/include/linux/rmi.h > +++ b/include/linux/rmi.h > @@ -99,6 +99,8 @@ struct rmi_2d_sensor_platform_data { > bool topbuttonpad; > bool kernel_tracking; > int dmax; > + int dribble; > + int palm_detect; > }; > > /** > @@ -116,14 +118,17 @@ struct rmi_f30_data { > bool disable; > }; > > -/** > - * struct rmi_f01_power - override default power management settings. > - * > + > +/* > + * Set the state of a register > + * DEFAULT - use the default value set by the firmware config > + * OFF - explicitly disable the register > + * ON - explicitly enable the register > */ > -enum rmi_f01_nosleep { > - RMI_F01_NOSLEEP_DEFAULT = 0, > - RMI_F01_NOSLEEP_OFF = 1, > - RMI_F01_NOSLEEP_ON = 2 > +enum rmi_reg_state { > + RMI_REG_STATE_DEFAULT = 0, > + RMI_REG_STATE_OFF = 1, > + RMI_REG_STATE_ON = 2 > }; > > /** > @@ -143,7 +148,7 @@ enum rmi_f01_nosleep { > * when the touch sensor is in doze mode, in units of 10ms. > */ > struct rmi_f01_power_management { > - enum rmi_f01_nosleep nosleep; > + enum rmi_reg_state nosleep; > u8 wakeup_threshold; > u8 doze_holdoff; > u8 doze_interval; > -- > 2.7.4 > -- Dmitry