A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add synaptics major and minor

Browse source 
TP:
Add synaptics major and minor events reporting.

Change-Id: Iaff3ee25c7e96d81b5d5694481f55633d6112cdc
Reviewed-on: https://gerrit.mot.com/1501279
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jialei Hao <haojl2@motorola.com>
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
litong 2020-03-23 17:14:33 +08:00 • committed by litong20
commit bcabfcd7b2
3 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_i2c.c
View file

@ -185,6 +185,21 @@ static int parse_dt(struct device *dev, struct syna_tcm_board_data *bdata)
bdata->tpio_reset_gpio = -1;
}
prop = of_find_property(np, "synaptics,size_to_pixel_multiple_factor", NULL);
if (prop && prop->length) {
retval = of_property_read_u32(np, "synaptics,size_to_pixel_multiple_factor",
&value);
if (retval < 0) {
LOGE(dev,
"Unable to read synaptics,size_to_pixel_multiple_factor property\n");
return retval;
} else {
bdata->size_to_pixel_multiple_factor = value;
}
} else {
bdata->size_to_pixel_multiple_factor = 128;
}
prop = of_find_property(np, "synaptics,x-flip", NULL);
bdata->x_flip = prop > 0 ? true : false;

1
drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_tcm.h
View file

@ -40,6 +40,7 @@ struct syna_tcm_board_data {
bool x_flip;
bool y_flip;
bool swap_axes;
int size_to_pixel_multiple_factor;
int irq_gpio;
int irq_on_state;
int power_gpio;

16
drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c
View file

@ -632,6 +632,8 @@ static void touch_report(void)
unsigned int idx;
unsigned int x;
unsigned int y;
unsigned int major;
unsigned int minor;
unsigned int temp;
unsigned int status;
unsigned int touch_count;
@ -697,6 +699,8 @@ static void touch_report(void)
case GLOVED_FINGER:
x = object_data[idx].x_pos;
y = object_data[idx].y_pos;
minor = object_data[idx].x_width * bdata->size_to_pixel_multiple_factor;
major = object_data[idx].y_width * bdata->size_to_pixel_multiple_factor;
if (bdata->swap_axes) {
temp = x;
x = y;
@ -719,12 +723,16 @@ static void touch_report(void)
ABS_MT_POSITION_X, x);
input_report_abs(touch_hcd->input_dev,
ABS_MT_POSITION_Y, y);
input_report_abs(touch_hcd->input_dev,
ABS_MT_TOUCH_MAJOR, major);
input_report_abs(touch_hcd->input_dev,
ABS_MT_TOUCH_MINOR, minor);
#ifndef TYPE_B_PROTOCOL
input_mt_sync(touch_hcd->input_dev);
#endif
LOGD(tcm_hcd->pdev->dev.parent,
"Finger %d: x = %d, y = %d\n",
idx, x, y);
"Finger %d: x = %d, y = %d, x_width = %d, y_width = %d\n",
idx, x, y, object_data[idx].x_width, object_data[idx].y_width);
touch_count++;
break;
default:
@ -767,6 +775,10 @@ static int touch_set_input_params(void)
ABS_MT_POSITION_X, 0, touch_hcd->max_x, 0, 0);
input_set_abs_params(touch_hcd->input_dev,
ABS_MT_POSITION_Y, 0, touch_hcd->max_y, 0, 0);
input_set_abs_params(touch_hcd->input_dev,
ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
input_set_abs_params(touch_hcd->input_dev,
ABS_MT_TOUCH_MINOR, 0, 255, 0, 0);
input_mt_init_slots(touch_hcd->input_dev, touch_hcd->max_objects,
INPUT_MT_DIRECT);