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-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

raydium_mmi: bound display concept

Browse source 
Touch now can be bound to display using device tree option. DRM
framework API provides display name to allow comparison. If touch
driver has bound display name specified, then probe will fail
whenever bound display name and name reported by DRM API do not
match.

Change-Id: I4b934efdbc38944faae36c49d093099d9ac50834
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1266671
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Konstantin Makariev 2018-11-08 12:39:46 -06:00 • committed by Konstantin Makariev
commit dcb042070c
2 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/input/touchscreen/raydium_mmi/raydium_i2c_ts.c
View file

@ -102,6 +102,7 @@ struct raydium_ts_platform_data {
u32 soft_rst_dly;
u32 num_max_touches;
u32 ctrl_dsi;
const char *bound_display;
};
struct raydium_ts_data {
@ -4932,6 +4933,7 @@ static int raydium_parse_dt(struct device *dev, struct raydium_ts_platform_data
{
struct device_node *np = dev->of_node;
int rc = 0;
const char *display_name = NULL;
u32 temp_val = 0;
pdata->name = RAYDIUM_NAME;
@ -4991,6 +4993,12 @@ static int raydium_parse_dt(struct device *dev, struct raydium_ts_platform_data
pdata->ctrl_dsi = temp_val;
}
rc = of_property_read_string(np, "raydium,bound-display", &display_name);
if (!rc)
{
pdata->bound_display = display_name;
}
return 0;
}
#else
@ -5170,11 +5178,12 @@ static void raydium_ready_handler(struct work_struct *work)
container_of(work, struct delayed_work, work);
struct raydium_ts_data *raydium_ts =
container_of(dw, struct raydium_ts_data, ready_work);
struct raydium_ts_platform_data *pdata = raydium_ts->pdata;
int ret, probe_status;
/* CLI display ID is 1 */
/* 3rd parameter is NULL now, but we might need to start */
/* retrieving it later if found necessary */
bool status = dsi_display_is_panel_enable(1, &probe_status, NULL);
bool status = dsi_display_is_panel_enable(pdata->ctrl_dsi, &probe_status, NULL);
if (!status && probe_status == -ENODEV) {
dev_err(&raydium_ts->client->dev, "[touch]touch ic not present\n");
@ -5226,6 +5235,21 @@ static int raydium_ts_probe(struct i2c_client *client,
pdata = client->dev.platform_data;
}
/* Touch can be bound to display. If that's the case,
* we need to check if control dsi associated with the
* same display name and fail probe otherwise */
if (pdata->bound_display) {
int probe_status;
char *display_name = NULL;
dsi_display_is_panel_enable(pdata->ctrl_dsi, &probe_status, &display_name);
if (probe_status == -ENODEV || (display_name &&
strncmp(display_name, pdata->bound_display, strlen(pdata->bound_display)))) {
dev_err(&client->dev, "[touch]display binding failed\n");
return -ENODEV;
}
}
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
return -ENODEV;

6
drivers/input/touchscreen/raydium_mmi/raydium_i2c_ts.h
View file

@ -133,9 +133,9 @@
#define MSM_NEW_VER
#define PINCTRL_STATE_ACTIVE "pmx_ts_active"
#define PINCTRL_STATE_SUSPEND "pmx_ts_suspend"
#define PINCTRL_STATE_RELEASE "pmx_ts_release"
#define PINCTRL_STATE_ACTIVE "ts_sub_int_active"
#define PINCTRL_STATE_SUSPEND "ts_sub_int_suspend"
#define PINCTRL_STATE_RELEASE "ts_sub_int_release"
#endif /*__LINUX_RAYDIUM_H*/