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-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use touch class unified interface to support edge gesture

Browse source 
TP:
Modify the edge gesture node, use the unified interface in the
touchscreen class.

Change-Id: I94c2c4da74ca1e653fb26a0683a33a8cd8504ca4
Reviewed-on: https://gerrit.mot.com/1544089
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
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-04-29 16:07:50 +08:00 • committed by litong20
commit 8a43f52f68
4 changed files with 88 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core.h
View file

@ -441,14 +441,6 @@ struct syna_tcm_features {
unsigned char byte_2_reserved:7;
} __packed;
struct pill_region_data {
unsigned short region_side;
unsigned short y_start_l;
unsigned short y_end_l;
unsigned short y_start_r;
unsigned short y_end_r;
};
struct syna_tcm_hcd {
pid_t isr_pid;
atomic_t command_status;
@ -477,10 +469,6 @@ struct syna_tcm_hcd {
unsigned int wr_chunk_size;
unsigned int app_status;
/*edge gesture*/
unsigned short gs_distance_data;
struct pill_region_data region_data;
struct platform_device *pdev;
struct regulator *pwr_reg;
struct regulator *bus_reg;

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

@ -200,12 +200,6 @@ static int parse_dt(struct device *dev, struct syna_tcm_board_data *bdata)
bdata->size_to_pixel_multiple_factor = 128;
}
prop = of_find_property(np, "synaptics,pill-region-control", NULL);
bdata->pill_region_ctrl = prop > 0 ? true : false;
prop = of_find_property(np, "synaptics,gs-distance-control", NULL);
bdata->gs_distance_ctrl = prop > 0 ? true : false;
prop = of_find_property(np, "synaptics,x-flip", NULL);
bdata->x_flip = prop > 0 ? true : false;

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

@ -60,8 +60,6 @@ struct syna_tcm_board_data {
unsigned long irq_flags;
const char *pwr_reg_name;
const char *bus_reg_name;
bool pill_region_ctrl;
bool gs_distance_ctrl;
};
#endif

360
drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_ts_mmi.c
View file

@ -29,95 +29,26 @@
} \
}
static ssize_t syna_ts_pill_region_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size);
static ssize_t syna_ts_pill_region_show(struct device *dev,
struct device_attribute *attr, char *buf);
static ssize_t syna_ts_gs_distance_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size);
static ssize_t syna_ts_gs_distance_show(struct device *dev,
struct device_attribute *attr, char *buf);
static DEVICE_ATTR(pill_region, (S_IRUGO | S_IWUSR | S_IWGRP),
syna_ts_pill_region_show, syna_ts_pill_region_store);
static DEVICE_ATTR(gs_distance, (S_IRUGO | S_IWUSR | S_IWGRP),
syna_ts_gs_distance_show, syna_ts_gs_distance_store);
#define MAX_ATTRS_ENTRIES 10
#define ADD_ATTR(name) { \
if (idx < MAX_ATTRS_ENTRIES) { \
dev_info(dev, "%s: [%d] adding %p\n", __func__, idx, &dev_attr_##name.attr); \
ext_attributes[idx] = &dev_attr_##name.attr; \
idx++; \
} else { \
dev_err(dev, "%s: cannot add attribute '%s'\n", __func__, #name); \
} \
}
static struct attribute *ext_attributes[MAX_ATTRS_ENTRIES];
static struct attribute_group ext_attr_group = {
.attrs = ext_attributes,
struct pill_region_data {
unsigned short y_start_l;
unsigned short y_end_l;
unsigned short y_start_r;
unsigned short y_end_r;
};
static int syna_ts_extend_attribute_group(struct device *dev, struct attribute_group **group)
{
int idx = 0;
const struct syna_tcm_hw_interface *hw_if;
const struct syna_tcm_board_data *bdata;
struct syna_tcm_hcd *tcm_hcd;
struct platform_device *pdev;
LOGN(dev, "syna_ts_extend_attribute_group\n");
GET_SYNA_DATA(dev);
hw_if = tcm_hcd->hw_if;
if (!hw_if) {
LOGE(dev, "Hardware interface not found\n");
return -ENODEV;
}
bdata = hw_if->bdata;
if (bdata->pill_region_ctrl)
ADD_ATTR(pill_region);
if (bdata->gs_distance_ctrl)
ADD_ATTR(gs_distance);
if (idx) {
ext_attributes[idx] = NULL;
*group = &ext_attr_group;
} else
*group = NULL;
return 0;
}
static ssize_t syna_ts_gs_distance_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size)
static int syna_ts_mmi_methods_gs_distance(struct device *dev, int value)
{
int retval;
unsigned long value;
unsigned short buffer;
struct syna_tcm_hcd *tcm_hcd;
struct platform_device *pdev;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_SYNA_DATA(dev);
retval = kstrtoul(buf, 0, &value);
if (retval)
return -EINVAL;
mutex_lock(&tcm_hcd->extif_mutex);
buffer = (unsigned short)value;
dev_info(dev, "%s: program value 0x%02x\n", __func__, (unsigned int)value);
dev_dbg(dev, "%s: program value 0x%02x\n", __func__, (unsigned int)value);
if (tcm_hcd->gs_distance_data == buffer) {
dev_dbg(dev, "%s: value is same,so not write.\n", __func__);
retval = size;
goto exit;
}
tcm_hcd->gs_distance_data = buffer;
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_X_WIDTH,
buffer);
@ -127,24 +58,19 @@ static ssize_t syna_ts_gs_distance_store(struct device *dev,
"Failed to enable wakeup gesture mode\n");
goto exit;
}
retval = size;
exit:
mutex_unlock(&tcm_hcd->extif_mutex);
return retval;
}
static ssize_t syna_ts_gs_distance_show(struct device *dev,
struct device_attribute *attr, char *buf)
static int syna_ts_mmi_methods_get_gs_distance(struct device *dev, void *idata)
{
int retval;
unsigned short value;
ssize_t blen = 0;
struct syna_tcm_hcd *tcm_hcd;
struct platform_device *pdev;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_SYNA_DATA(dev);
mutex_lock(&tcm_hcd->extif_mutex);
@ -153,209 +79,176 @@ static ssize_t syna_ts_gs_distance_show(struct device *dev,
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to read gs_distance (%d)\n",retval );
else
blen += scnprintf(buf, PAGE_SIZE, "0x%02x", (unsigned int)value);
TO_INT(idata) = value;
dev_dbg(dev, "%s: program value 0x%02x\n", __func__, (unsigned int)value);
mutex_unlock(&tcm_hcd->extif_mutex);
return blen;
return retval;
}
static int syna_ts_get_pill_region(struct syna_tcm_hcd *tcm_hcd)
static int syna_ts_get_pill_region(struct syna_tcm_hcd *tcm_hcd, struct pill_region_data *region_data)
{
int retval;
struct pill_region_data *region_data;
region_data = &tcm_hcd->region_data;
retval = tcm_hcd->get_dynamic_config(tcm_hcd,
DC_SUPP_Y_START_L, &region_data->y_start_l);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to read LEFT_Y_START (%d)\n", retval);
return retval;
}
retval = tcm_hcd->get_dynamic_config(tcm_hcd,
DC_SUPP_Y_END_L, &region_data->y_end_l);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to read LEFT_Y_END (%d)\n", retval);
return retval;
}
retval = tcm_hcd->get_dynamic_config(tcm_hcd,
DC_SUPP_Y_START_R, &region_data->y_start_r);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to read RIGHT_Y_START (%d)\n", retval);
return retval;
}
retval = tcm_hcd->get_dynamic_config(tcm_hcd,
DC_SUPP_Y_END_R, &region_data->y_end_r);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to read RIGHT_Y_END (%d)\n", retval);
return retval;
}
static int syna_ts_set_pill_region(struct syna_tcm_hcd *tcm_hcd)
{
int retval;
struct pill_region_data *region_data;
region_data = &tcm_hcd->region_data;
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_START_L, region_data->y_start_l);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
"Failed to set LEFT_Y_START of pill_region\n");
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_END_L, region_data->y_end_l);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
"Failed to set LEFT_Y_END of pill_region\n");
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_START_R, region_data->y_start_r);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
"Failed to set RIGHT_Y_START of pill_region\n");
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_END_R, region_data->y_end_r);
if (retval < 0)
LOGD(tcm_hcd->pdev->dev.parent,
"Failed to set RIGHT_Y_END of pill_region\n");
return retval;
}
#define REQ_ARGS_NUM 3
static ssize_t syna_ts_pill_region_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size)
{
int retval;
unsigned short args[3] = {0};
struct syna_tcm_hcd *tcm_hcd;
struct platform_device *pdev;
struct pill_region_data *region_data;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_SYNA_DATA(dev);
mutex_lock(&tcm_hcd->extif_mutex);
region_data = &tcm_hcd->region_data;
retval = sscanf(buf, "0x%hx 0x%hx 0x%hx", &args[0], &args[1], &args[2]);
if (retval < REQ_ARGS_NUM) {
retval = -EINVAL;
goto exit;
return retval;
}
dev_info(dev, "%s: program pill region:0x%02hx 0x%04hx 0x%04hx\n",
__func__, args[0], args[1], args[2]);
return retval;
}
region_data->region_side = args[0];
switch (region_data->region_side) {
static int syna_ts_set_pill_region(struct syna_tcm_hcd *tcm_hcd, struct pill_region_data region_data)
{
int retval;
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_START_L, region_data.y_start_l);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to set LEFT_Y_START of pill_region\n");
return retval;
}
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_END_L, region_data.y_end_l);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to set LEFT_Y_END of pill_region\n");
return retval;
}
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_START_R, region_data.y_start_r);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to set RIGHT_Y_START of pill_region\n");
return retval;
}
retval = tcm_hcd->set_dynamic_config(tcm_hcd,
DC_SUPP_Y_END_R, region_data.y_end_r);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to set RIGHT_Y_END of pill_region\n");
return retval;
}
return retval;
}
static int syna_ts_mmi_methods_pill_region(struct device *dev, int *value)
{
int retval;
struct pill_region_data region_data;
struct syna_tcm_hcd *tcm_hcd;
struct platform_device *pdev;
GET_SYNA_DATA(dev);
dev_dbg(dev, "%s: program pill region:0x%02x 0x%04x 0x%04x\n",
__func__, value[0], value[1], value[2]);
switch (value[0]) {
case 0:
if (!region_data->y_start_l && !region_data->y_end_l
&& !region_data->y_start_r && !region_data->y_end_r) {
dev_info(dev, "%s: The value of region side is same, so not write.\n",
__func__);
retval = size;
goto exit;
}
region_data->y_start_l = 0x00;
region_data->y_end_l = 0x00;
region_data->y_start_r = 0x00;
region_data->y_end_r = 0x00;
region_data.y_start_l = 0x00;
region_data.y_end_l = 0x00;
region_data.y_start_r = 0x00;
region_data.y_end_r = 0x00;
break;
case 1:
if (region_data->y_start_l == args[1] && region_data->y_end_l == args[2]) {
dev_info(dev, "%s: The values of left region are same, so not write.\n", __func__);
retval = size;
goto exit;
}
region_data->y_start_l = args[1];
region_data->y_end_l = args[2];
region_data->y_start_r = 0x00;
region_data->y_end_r = 0x00;
region_data.y_start_l = (unsigned short)value[1];
region_data.y_end_l = (unsigned short)value[2];
region_data.y_start_r = 0x00;
region_data.y_end_r = 0x00;
break;
case 2:
if (region_data->y_start_r == args[1] && region_data->y_end_r == args[2]) {
dev_info(dev, "%s: The values of right region are same, so not write.\n", __func__);
retval = size;
goto exit;
}
region_data->y_start_l = 0x00;
region_data->y_end_l = 0x00;
region_data->y_start_r = args[1];
region_data->y_end_r = args[2];
region_data.y_start_l = 0x00;
region_data.y_end_l = 0x00;
region_data.y_start_r = (unsigned short)value[1];
region_data.y_end_r = (unsigned short)value[2];
break;
default:
LOGE(dev, "The commond is not support!\n");
retval = -EINVAL;
goto exit;
return -EINVAL;
}
mutex_lock(&tcm_hcd->extif_mutex);
retval = syna_ts_set_pill_region(tcm_hcd);
retval = syna_ts_set_pill_region(tcm_hcd, region_data);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to set pill_region none\n");
goto exit;
}
retval = size;
exit:
mutex_unlock(&tcm_hcd->extif_mutex);
return retval;
}
static ssize_t syna_ts_pill_region_show(struct device *dev,
struct device_attribute *attr, char *buf)
static int syna_ts_mmi_methods_get_pill_region(struct device *dev, void *idata)
{
int retval;
ssize_t blen = 0;
struct pill_region_data region_data;
struct syna_tcm_hcd *tcm_hcd;
struct platform_device *pdev;
struct pill_region_data *region_data;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_SYNA_DATA(dev);
dev_info(dev, "%s: program pill region show",__func__);
mutex_lock(&tcm_hcd->extif_mutex);
region_data = &tcm_hcd->region_data;
retval = syna_ts_get_pill_region(tcm_hcd);
retval = syna_ts_get_pill_region(tcm_hcd, &region_data);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to get pill_region value (%d)\n", retval);
goto exit;
}
switch (region_data->region_side) {
case 0:
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%02x ", 0);
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%hx ", region_data->y_start_r);
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%hx ", region_data->y_end_r);
break;
if (region_data.y_start_l == 0 && region_data.y_end_l == 0) {
if (region_data.y_start_r == 0 && region_data.y_end_r == 0)
((int *)idata)[0] = 0x00;
else
((int *)idata)[0] = 0x02;
case 1:
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%02x ", 1);
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%hx ", region_data->y_start_l);
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%hx ", region_data->y_end_l);
break;
((int *)idata)[1] = region_data.y_start_r;
((int *)idata)[2] = region_data.y_end_r;
case 2:
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%02x ", 2);
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%hx ", region_data->y_start_r);
blen += scnprintf(buf+blen, PAGE_SIZE, "0x%hx ", region_data->y_end_r);
break;
default:
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to read the pill_region (%d)\n", retval);
} else {
((int *)idata)[0] = 0x01;
((int *)idata)[1] = region_data.y_start_l;
((int *)idata)[2] = region_data.y_end_l;
}
retval = blen;
dev_dbg(dev, "%s: program pill region show %02x, %x, %x",__func__,((int *)idata)[0], ((int *)idata)[1], ((int *)idata)[2]);
exit:
mutex_unlock(&tcm_hcd->extif_mutex);
@ -686,15 +579,17 @@ static struct ts_mmi_methods syna_ts_mmi_methods = {
.get_drv_irq = syna_ts_mmi_methods_get_drv_irq,
.get_flashprog = syna_ts_mmi_methods_get_flashprog,
.get_poweron = syna_ts_mmi_methods_get_poweron,
.get_gs_distance = syna_ts_mmi_methods_get_gs_distance,
.get_pill_region = syna_ts_mmi_methods_get_pill_region,
/* SET methods */
.reset = syna_ts_mmi_methods_reset,
.drv_irq = syna_ts_mmi_methods_drv_irq,
.power = syna_ts_mmi_methods_power,
.charger_mode = syna_ts_mmi_charger_mode,
.gs_distance = syna_ts_mmi_methods_gs_distance,
.pill_region = syna_ts_mmi_methods_pill_region,
/* Firmware */
.firmware_update = syna_ts_firmware_update,
/* vendor specific attribute group */
.extend_attribute_group = syna_ts_extend_attribute_group,
/* PM callback */
.panel_state = syna_ts_mmi_panel_state,
.post_resume = syna_ts_mmi_post_resume,
@ -702,7 +597,6 @@ static struct ts_mmi_methods syna_ts_mmi_methods = {
int syna_ts_mmi_dev_register(struct syna_tcm_hcd *tcm_hcd) {
int ret;
const struct syna_tcm_board_data *bdata = tcm_hcd->hw_if->bdata;
ret = ts_mmi_dev_register(tcm_hcd->pdev->dev.parent, &syna_ts_mmi_methods);
if (ret) {
@ -713,30 +607,6 @@ int syna_ts_mmi_dev_register(struct syna_tcm_hcd *tcm_hcd) {
/* initialize class imported methods */
tcm_hcd->imports = &syna_ts_mmi_methods.exports;
if(bdata->pill_region_ctrl) {
ret = syna_ts_get_pill_region(tcm_hcd);
if (ret < 0)
dev_err(tcm_hcd->pdev->dev.parent, "%s: failed to read pill region (%d)\n",
__func__, ret);
dev_err(tcm_hcd->pdev->dev.parent, "%s: pill region is set to default value\n", __func__);
tcm_hcd->region_data.region_side = 0x00;
tcm_hcd->region_data.y_start_l = 0x00;
tcm_hcd->region_data.y_end_l = 0x00;
tcm_hcd->region_data.y_start_r = 0x00;
tcm_hcd->region_data.y_end_r = 0x00;
}
if(bdata->gs_distance_ctrl) {
ret = tcm_hcd->get_dynamic_config(tcm_hcd, DC_SUPP_X_WIDTH,
&tcm_hcd->gs_distance_data);
if (ret < 0) {
dev_err(tcm_hcd->pdev->dev.parent, "%s: failed to read grip supp distance (%d)\n",
__func__, ret);
dev_err(tcm_hcd->pdev->dev.parent, "%s: gs-distance is set to default value\n", __func__);
tcm_hcd->gs_distance_data = 0x1E;
}
}
return 0;
}