asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sec_mmi: add clip area

Browse source 
Mechanicals shortcomings require touch events from the bottom of the
screen to be suppressed to avoid unwanted side effects. Adding clip
area option controlled via device tree to support this.

Change-Id: I744197e8db6f595ea77e482f53f29e48e0497e2d
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1707675
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Igor Kovalenko <igork@motorola.com>
Submit-Approved: Jira Key
Reviewed-by: Ryan Lattrel <ryanl@motorola.com>
This commit is contained in:
Konstantin Makariev 2020-07-28 09:18:40 -05:00 committed by Konstantin Makariev
parent 763f6485fc
commit e12df6e95d
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/input/touchscreen/sec_mmi/sec_ts.c
View file

@ -545,6 +545,11 @@ void sec_ts_reinit(struct sec_ts_data *ts)
return;
}
#define MIN_X 0
#define MAX_X 1
#define MIN_Y 2
#define MAX_Y 3
#define STATUS_ID_HOLD_GRIP 0x69
#define MAX_EVENT_COUNT 32
static void sec_ts_read_event(struct sec_ts_data *ts)
@ -735,6 +740,40 @@ static void sec_ts_read_event(struct sec_ts_data *ts)
if (ts->coord[t_id].z <= 0)
ts->coord[t_id].z = 1;
if (ts->plat_data->clip_area) {
if (unlikely(!((ts->coord[t_id].x >= ts->plat_data->clip_area[MIN_X])
&& (ts->coord[t_id].x <= ts->plat_data->clip_area[MAX_X])
&& (ts->coord[t_id].y >= ts->plat_data->clip_area[MIN_Y])
&& (ts->coord[t_id].y <= ts->plat_data->clip_area[MAX_Y])))) {
input_dbg(true, &ts->client->dev,
"CLIP: tid[%d] type (%02X %02X), action %02X, xy (%02X %02X)\n",
t_id, ts->coord[t_id].ttype, pre_ttype,
ts->coord[t_id].action, ts->coord[t_id].x, ts->coord[t_id].y);
if (ts->coord[t_id].action == SEC_TS_COORDINATE_ACTION_MOVE) {
/* send release event for the touch entering clip area */
input_mt_slot(ts->input_dev, t_id);
if (ts->plat_data->support_mt_pressure)
input_report_abs(ts->input_dev, ABS_MT_PRESSURE, 0);
input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, 0);
if (ts->touch_count > 0)
ts->touch_count--;
if (ts->touch_count == 0) {
input_report_key(ts->input_dev, BTN_TOUCH, 0);
input_report_key(ts->input_dev, BTN_TOOL_FINGER, 0);
ts->check_multi = 0;
}
}
/* cancel further processing */
ts->coord[t_id].action = SEC_TS_COORDINATE_ACTION_NONE;
ts->coord[t_id].mcount = 0;
ts->coord[t_id].palm_count = 0;
break;
}
}
if ((ts->coord[t_id].ttype == SEC_TS_TOUCHTYPE_NORMAL)
|| (ts->coord[t_id].ttype == SEC_TS_TOUCHTYPE_PALM)
|| (ts->coord[t_id].ttype == SEC_TS_TOUCHTYPE_WET)
@ -1214,6 +1253,7 @@ static int sec_ts_parse_dt(struct i2c_client *client)
struct device_node *np = dev->of_node;
u32 coords[2];
u32 finger_size[2];
u32 clip_area[4];
int ret = 0;
int count = 0;
u32 ic_match_value;
@ -1300,6 +1340,15 @@ static int sec_ts_parse_dt(struct i2c_client *client)
pdata->max_y = coords[1] - 1;
}
if (!of_property_read_u32_array(np, "sec,clip-area", clip_area, 4)) {
pdata->clip_area = devm_kzalloc(&client->dev, sizeof(clip_area), GFP_KERNEL);
if (!pdata->clip_area)
return -ENOMEM;
memcpy(pdata->clip_area, clip_area, sizeof(clip_area));
input_info(true, dev, "%s: clip (%d,%d) (%d,%d)\n", __func__,
clip_area[0], clip_area[1], clip_area[2], clip_area[3]);
}
if (of_property_read_u32_array(np, "sec,max_finger_size", finger_size, 2)) {
pdata->max_major = 255;
pdata->max_minor = 255;

2
drivers/input/touchscreen/sec_mmi/sec_ts.h
View file

@ -798,6 +798,8 @@ struct sec_ts_plat_data {
bool hold_distance_ctrl;
bool gs_distance_ctrl;
bool hold_grip_ctrl;
unsigned *clip_area;
};
typedef struct {