Merge "input: ft5x06: defer touch resume to workqueue" (65aa9393) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ Optional properties:
		- focaltech,fw-name : specify the firmware file name
		- focaltech,psensor-support : specify whether support the proximity sensor
		- focaltech,gesture-support : specify whether support gesture feature
		- focaltech,resume-in-workqueue : specifiy whether to defer the resume to workqueue

		Example:
		i2c@f9923000{

drivers/input/touchscreen/ft5x06_ts.c

+32 −6

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ struct ft5x06_ts_data {
		u8 fw_vendor_id;
		struct kobject ts_info_kobj;
		#if defined(CONFIG_FB)
		struct work_struct fb_notify_work;
		struct notifier_block fb_notif;
		#elif defined(CONFIG_HAS_EARLYSUSPEND)
		struct early_suspend early_suspend;
		@@ -1137,6 +1138,13 @@ static int ft5x06_ts_resume(struct device *dev)
		#endif

		#if defined(CONFIG_FB)
		static void fb_notify_resume_work(struct work_struct *work)
		{
		struct ft5x06_ts_data *ft5x06_data =
		container_of(work, struct ft5x06_ts_data, fb_notify_work);
		ft5x06_ts_resume(&ft5x06_data->client->dev);
		}

		static int fb_notifier_callback(struct notifier_block *self,
		unsigned long event, void *data)
		{
		@@ -1145,13 +1153,27 @@ static int fb_notifier_callback(struct notifier_block *self,
		struct ft5x06_ts_data *ft5x06_data =
		container_of(self, struct ft5x06_ts_data, fb_notif);

		if (evdata && evdata->data && event == FB_EVENT_BLANK &&
		ft5x06_data && ft5x06_data->client) {
		if (evdata && evdata->data && ft5x06_data && ft5x06_data->client) {
		blank = evdata->data;
		if (ft5x06_data->pdata->resume_in_workqueue) {
		if (event == FB_EARLY_EVENT_BLANK &&
		*blank == FB_BLANK_UNBLANK)
		schedule_work(&ft5x06_data->fb_notify_work);
		else if (event == FB_EVENT_BLANK &&
		*blank == FB_BLANK_POWERDOWN) {
		flush_work(&ft5x06_data->fb_notify_work);
		ft5x06_ts_suspend(&ft5x06_data->client->dev);
		}
		} else {
		if (event == FB_EVENT_BLANK) {
		if (*blank == FB_BLANK_UNBLANK)
		ft5x06_ts_resume(&ft5x06_data->client->dev);
		ft5x06_ts_resume(
		&ft5x06_data->client->dev);
		else if (*blank == FB_BLANK_POWERDOWN)
		ft5x06_ts_suspend(&ft5x06_data->client->dev);
		ft5x06_ts_suspend(
		&ft5x06_data->client->dev);
		}
		}
		}

		return 0;
		@@ -1918,6 +1940,9 @@ static int ft5x06_parse_dt(struct device *dev,
		pdata->gesture_support = of_property_read_bool(np,
		"focaltech,gesture-support");

		pdata->resume_in_workqueue = of_property_read_bool(np,
		"focaltech,resume-in-workqueue");

		rc = of_property_read_u32(np, "focaltech,family-id", &temp_val);
		if (!rc)
		pdata->family_id = temp_val;
		@@ -2270,6 +2295,7 @@ static int ft5x06_ts_probe(struct i2c_client *client,
		data->fw_ver[1], data->fw_ver[2]);

		#if defined(CONFIG_FB)
		INIT_WORK(&data->fb_notify_work, fb_notify_resume_work);
		data->fb_notif.notifier_call = fb_notifier_callback;

		err = fb_register_client(&data->fb_notif);

include/linux/input/ft5x06_ts.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ struct ft5x06_ts_platform_data {
		bool i2c_pull_up;
		bool ignore_id_check;
		bool gesture_support;
		bool resume_in_workqueue;
		int (*power_init)(bool);
		int (*power_on)(bool);
		};