xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: synaptics-rmi4 - add parameters for dribble packets and palm detect gesture

Browse Source 
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 05ba999fca ("HID: rmi: disable dribble packets on Synaptics
touchpads")

For more information on the palm detect gesture:
Commit f097deef59 ("HID: rmi: disable palm detect gesture when present")

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Andrew Duggan
2016-11-08 16:48:48 -08:00
committed by Dmitry Torokhov
parent 6d0dbeae71
commit 2775e52324
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/rmi4/rmi_2d_sensor.h
View File

@@ -67,6 +67,8 @@ struct rmi_2d_sensor {
u8 report_rel; u8 report_rel;
u8 x_mm; u8 x_mm;
u8 y_mm; u8 y_mm;
enum rmi_reg_state dribble;
enum rmi_reg_state palm_detect;
}; };
int rmi_2d_sensor_of_probe(struct device *dev, int rmi_2d_sensor_of_probe(struct device *dev,

6
drivers/input/rmi4/rmi_f01.c
View File

@@ -327,12 +327,12 @@ static int rmi_f01_probe(struct rmi_function *fn)
} }
switch (pdata->power_management.nosleep) { switch (pdata->power_management.nosleep) {
case RMI_F01_NOSLEEP_DEFAULT: case RMI_REG_STATE_DEFAULT:
break; break;
case RMI_F01_NOSLEEP_OFF: case RMI_REG_STATE_OFF:
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT; f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
break; break;
case RMI_F01_NOSLEEP_ON: case RMI_REG_STATE_ON:
f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT; f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
break; break;
} }

32
drivers/input/rmi4/rmi_f11.c
View File

@@ -1142,6 +1142,8 @@ static int rmi_f11_initialize(struct rmi_function *fn)
sensor->topbuttonpad = f11->sensor_pdata.topbuttonpad; sensor->topbuttonpad = f11->sensor_pdata.topbuttonpad;
sensor->kernel_tracking = f11->sensor_pdata.kernel_tracking; sensor->kernel_tracking = f11->sensor_pdata.kernel_tracking;
sensor->dmax = f11->sensor_pdata.dmax; 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) { if (f11->sens_query.has_physical_props) {
sensor->x_mm = f11->sens_query.x_sensor_size_mm; 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] = ctrl->ctrl0_11[RMI_F11_DELTA_Y_THRESHOLD] =
sensor->axis_align.delta_y_threshold; sensor->axis_align.delta_y_threshold;
if (f11->sens_query.has_dribble) if (f11->sens_query.has_dribble) {
ctrl->ctrl0_11[0] = ctrl->ctrl0_11[0] & ~BIT(6); switch (sensor->dribble) {
case RMI_REG_STATE_OFF:
ctrl->ctrl0_11[0] &= ~BIT(6);
break;
case RMI_REG_STATE_ON:
ctrl->ctrl0_11[0] |= BIT(6);
break;
case RMI_REG_STATE_DEFAULT:
default:
break;
}
}
if (f11->sens_query.has_palm_det) if (f11->sens_query.has_palm_det) {
ctrl->ctrl0_11[11] = ctrl->ctrl0_11[11] & ~BIT(0); switch (sensor->palm_detect) {
case RMI_REG_STATE_OFF:
ctrl->ctrl0_11[11] &= ~BIT(0);
break;
case RMI_REG_STATE_ON:
ctrl->ctrl0_11[11] |= BIT(0);
break;
case RMI_REG_STATE_DEFAULT:
default:
break;
}
}
rc = f11_write_control_regs(fn, &f11->sens_query, rc = f11_write_control_regs(fn, &f11->sens_query,
&f11->dev_controls, fn->fd.query_base_addr); &f11->dev_controls, fn->fd.query_base_addr);

21
include/linux/rmi.h
View File

@@ -99,6 +99,8 @@ struct rmi_2d_sensor_platform_data {
bool topbuttonpad; bool topbuttonpad;
bool kernel_tracking; bool kernel_tracking;
int dmax; int dmax;
int dribble;
int palm_detect;
}; };
/** /**
@@ -116,14 +118,17 @@ struct rmi_f30_data {
bool disable; 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 { enum rmi_reg_state {
RMI_F01_NOSLEEP_DEFAULT = 0, RMI_REG_STATE_DEFAULT = 0,
RMI_F01_NOSLEEP_OFF = 1, RMI_REG_STATE_OFF = 1,
RMI_F01_NOSLEEP_ON = 2 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. * when the touch sensor is in doze mode, in units of 10ms.
*/ */
struct rmi_f01_power_management { struct rmi_f01_power_management {
enum rmi_f01_nosleep nosleep; enum rmi_reg_state nosleep;
u8 wakeup_threshold; u8 wakeup_threshold;
u8 doze_holdoff; u8 doze_holdoff;
u8 doze_interval; u8 doze_interval;