Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83be01dc authored by Fei Mao's avatar Fei Mao Committed by Gerrit - the friendly Code Review server
Browse files

input: touchscreen: st: new drm notifier 



Register new drm notifier to set touch to be in correct power state.

Change-Id: Id0358a92c62ca636bb0f3b424dc80721bd69863c
Signed-off-by: default avatarFei Mao <feim1@codeaurora.org>
parent 7352dd66

drivers/input/touchscreen/st/fts.c

+50 −17
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <linux/notifier.h>

#include <linux/fb.h>

#else

#include <linux/msm_drm_notify.h>

#include <drm/drm_panel.h>

#endif



#ifdef KERNEL_ABOVE_2_6_38
@@ -129,6 +129,8 @@ static int fts_command(struct fts_ts_info *info, unsigned char cmd); 
static int fts_chip_initialization(struct fts_ts_info *info);

static int fts_enable_reg(struct fts_ts_info *info, bool enable);



static struct drm_panel *active_panel;



void touch_callback(unsigned int status)

{

	/* Empty */
@@ -2234,7 +2236,9 @@ static ssize_t fts_stm_cmd_show(struct device *dev, 
#if defined(CONFIG_FB_MSM)

		res = fb_unregister_client(&info->notifier);

#else

	res = msm_drm_unregister_client(&info->notifier);

		if (active_panel)

			res = drm_panel_notifier_unregister(active_panel,

				&info->notifier);

#endif

		if (res < 0) {

			logError(1, "%s ERROR: unregister notifier failed!\n",
@@ -2437,7 +2441,8 @@ static ssize_t fts_stm_cmd_show(struct device *dev, 
	if (fb_register_client(&info->notifier) < 0)

		logError(1, "%s ERROR: register notifier failed!\n", tag);

#else

	if (msm_drm_register_client(&info->notifier) < 0)

	if (active_panel &&

		drm_panel_notifier_register(active_panel, &info->notifier) < 0)

		logError(1, "%s ERROR: register notifier failed!\n", tag);

#endif
@@ -3726,7 +3731,9 @@ static int fts_init_afterProbe(struct fts_ts_info *info) 
#if defined(CONFIG_FB_MSM)

	error |= fb_register_client(&info->notifier);

#else

	error |= msm_drm_register_client(&info->notifier);

	if (active_panel)

		error |= drm_panel_notifier_register(active_panel,

			&info->notifier);

#endif



	if (error < OK)
@@ -4199,21 +4206,21 @@ static int fts_fb_state_chg_callback(struct notifier_block *nb, 
{

	struct fts_ts_info *info = container_of(nb, struct fts_ts_info,

				notifier);

	struct msm_drm_notifier *evdata = data;

	struct drm_panel_notifier *evdata = data;

	unsigned int blank;



	if (!evdata || (evdata->id != 0))

	if (!evdata)

		return 0;



	if (val != MSM_DRM_EVENT_BLANK)

	if (val != DRM_PANEL_EVENT_BLANK)

		return 0;

	logError(0, "%s %s: fts notifier begin!\n", tag, __func__);



	if (evdata->data && val == MSM_DRM_EVENT_BLANK && info) {

	logError(0, "%s %s: fts notifier begin!\n", tag, __func__);

	if (evdata->data && val == DRM_PANEL_EVENT_BLANK && info) {

		blank = *(int *) (evdata->data);



		switch (blank) {

		case MSM_DRM_BLANK_POWERDOWN:

		case DRM_PANEL_BLANK_POWERDOWN:

			if (info->sensor_sleep)

				break;
@@ -4228,7 +4235,7 @@ static int fts_fb_state_chg_callback(struct notifier_block *nb, 
				queue_work(info->event_wq, &info->suspend_work);

			break;



		case MSM_DRM_BLANK_UNBLANK:

		case DRM_PANEL_BLANK_UNBLANK:

			if (!info->sensor_sleep)

				break;
@@ -4504,6 +4511,30 @@ static int parse_dt(struct device *dev, 
	return OK;

}



static int check_dt(struct device_node *np)

{

	int i;

	int count;

	struct device_node *node;

	struct drm_panel *panel;



	count = of_count_phandle_with_args(np, "panel", NULL);

	if (count <= 0)

		return OK;



	for (i = 0; i < count; i++) {

		node = of_parse_phandle(np, "panel", i);

		panel = of_drm_find_panel(node);

		of_node_put(node);

		if (!IS_ERR(panel)) {

			active_panel = panel;

			return OK;

		}

	}



	return -ENODEV;

}



static int fts_probe(struct i2c_client *client,

		const struct i2c_device_id *idp)

{
@@ -4515,16 +4546,17 @@ static int fts_probe(struct i2c_client *client, 


	logError(0, "%s %s: driver probe begin!\n", tag, __func__);



	logError(0, "%s SET I2C Functionality and Dev INFO:\n", tag);

	openChannel(client);

	logError(0, "%s driver ver. %s (built on)\n", tag, FTS_TS_DRV_VERSION);

	error = check_dt(dp);



	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {

	if (error != OK ||

		!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {

		logError(1, "%s Unsupported I2C functionality\n", tag);

		error = -EIO;

		goto ProbeErrorExit_0;

	}



	openChannel(client);



	info = kzalloc(sizeof(struct fts_ts_info), GFP_KERNEL);

	if (!info) {

		logError(1,
@@ -4921,7 +4953,8 @@ static int fts_remove(struct i2c_client *client) 
#if defined(CONFIG_FB_MSM)

	fb_unregister_client(&info->notifier);

#else

	msm_drm_unregister_client(&info->notifier);

	if (active_panel)

		drm_panel_notifier_register(active_panel, &info->notifier);

#endif



	/* unregister the device */