Merge "input: touchscreen: enable/disable wakeup gestures for synaptics v2.6" (8ec56f21) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/input/touchscreen/synaptics_dsxv26_i2c.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ Optional property:
		- synaptics,ub-i2c-addr : microbootloader mode I2C slave address.
		- synaptics,cap-button-codes : virtual key code mappings to be used.
		- synaptics,vir-button-codes : virtual key code and the response region on panel.
		- synaptics,wakeup-gestures-en: enable wakeup gestures.
		- synaptics,x-flip : modify orientation of the x axis.
		- synaptics,y-flip : modify orientation of the y axis.
		- synaptics,reset-delay-ms : reset delay for controller (ms), default 100.

drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c

+18 −17

Original line number	Diff line number	Diff line
		@@ -56,8 +56,6 @@
		#define TYPE_B_PROTOCOL
		#endif

		#define WAKEUP_GESTURE false

		#define NO_0D_WHILE_2D
		#define REPORT_2D_Z
		#define REPORT_2D_W
		@@ -1014,8 +1012,10 @@ static ssize_t synaptics_rmi4_wake_gesture_store(struct device *dev,

		input = input > 0 ? 1 : 0;

		if (rmi4_data->f11_wakeup_gesture \|\| rmi4_data->f12_wakeup_gesture)
		if (rmi4_data->f11_wakeup_gesture \|\| rmi4_data->f12_wakeup_gesture) {
		rmi4_data->enable_wakeup_gesture = input;
		rmi4_data->wakeup_gesture_en = input;
		}

		return count;
		}
		@@ -1089,7 +1089,6 @@ static int synaptics_rmi4_f11_abs_report(struct synaptics_rmi4_data *rmi4_data,
		input_sync(rmi4_data->input_dev);
		input_report_key(rmi4_data->input_dev, KEY_WAKEUP, 0);
		input_sync(rmi4_data->input_dev);
		rmi4_data->suspend = false;
		}

		return 0;
		@@ -1250,7 +1249,6 @@ static int synaptics_rmi4_f12_abs_report(struct synaptics_rmi4_data *rmi4_data,
		input_sync(rmi4_data->input_dev);
		input_report_key(rmi4_data->input_dev, KEY_WAKEUP, 0);
		input_sync(rmi4_data->input_dev);
		rmi4_data->suspend = false;
		}

		return 0;
		@@ -3114,7 +3112,7 @@ static int synaptics_rmi4_query_device(struct synaptics_rmi4_data *rmi4_data)
		}

		if (rmi4_data->f11_wakeup_gesture \|\| rmi4_data->f12_wakeup_gesture)
		rmi4_data->enable_wakeup_gesture = WAKEUP_GESTURE;
		rmi4_data->enable_wakeup_gesture = rmi4_data->wakeup_gesture_en;
		else
		rmi4_data->enable_wakeup_gesture = false;

		@@ -3954,6 +3952,7 @@ static int synaptics_rmi4_probe(struct platform_device *pdev)
		rmi4_data->suspend = false;
		rmi4_data->irq_enabled = false;
		rmi4_data->fingers_on_2d = false;
		rmi4_data->wakeup_gesture_en = bdata->wakeup_gesture_en;

		rmi4_data->reset_device = synaptics_rmi4_reset_device;
		rmi4_data->irq_enable = synaptics_rmi4_irq_enable;
		@@ -4423,7 +4422,8 @@ static int synaptics_rmi4_fb_notifier_cb(struct notifier_block *self,
		synaptics_secure_touch_stop(rmi4_data, false);
		} else if (event == FB_EVENT_BLANK) {
		transition = evdata->data;
		if (*transition == FB_BLANK_POWERDOWN) {
		if (*transition == FB_BLANK_POWERDOWN \|\|
		*transition == FB_BLANK_VSYNC_SUSPEND) {
		flush_work(
		&(rmi4_data->fb_notify_work));
		synaptics_rmi4_suspend(
		@@ -4564,8 +4564,10 @@ static int synaptics_rmi4_suspend(struct device *dev)
		synaptics_secure_touch_stop(rmi4_data, true);

		if (rmi4_data->enable_wakeup_gesture) {
		if (!rmi4_data->suspend) {
		synaptics_rmi4_wakeup_gesture(rmi4_data, true);
		enable_irq_wake(rmi4_data->irq);
		}
		goto exit;
		}

		@@ -4591,10 +4593,9 @@ static int synaptics_rmi4_suspend(struct device *dev)
		}
		mutex_unlock(&exp_data.mutex);

		if (!rmi4_data->suspend) {
		if (!rmi4_data->suspend && !rmi4_data->enable_wakeup_gesture)
		synaptics_rmi4_enable_reg(rmi4_data, false);
		synaptics_rmi4_get_reg(rmi4_data, false);
		}

		rmi4_data->suspend = true;

		return 0;
		@@ -4620,17 +4621,17 @@ static int synaptics_rmi4_resume(struct device *dev)
		synaptics_secure_touch_stop(rmi4_data, true);

		if (rmi4_data->enable_wakeup_gesture) {
		if (rmi4_data->suspend) {
		synaptics_rmi4_wakeup_gesture(rmi4_data, false);
		disable_irq_wake(rmi4_data->irq);
		}
		goto exit;
		}

		rmi4_data->current_page = MASK_8BIT;

		if (rmi4_data->suspend) {
		synaptics_rmi4_get_reg(rmi4_data, true);
		if (rmi4_data->suspend)
		synaptics_rmi4_enable_reg(rmi4_data, true);
		}

		synaptics_rmi4_sleep_enable(rmi4_data, false);
		synaptics_rmi4_irq_enable(rmi4_data, true, false);

drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -372,6 +372,7 @@ struct synaptics_rmi4_data {
		bool fb_ready;
		bool f11_wakeup_gesture;
		bool f12_wakeup_gesture;
		bool wakeup_gesture_en;
		bool enable_wakeup_gesture;
		bool wedge_sensor;
		bool report_pressure;

drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_i2c.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,9 @@ static int parse_dt(struct device dev, struct synaptics_dsx_board_data bdata)
		bdata->resume_in_workqueue = of_property_read_bool(np,
		"synaptics,resume-in-workqueue");

		bdata->wakeup_gesture_en = of_property_read_bool(np,
		"synaptics,wakeup-gestures-en");

		retval = of_property_read_string(np, "synaptics,pwr-reg-name", &name);
		if (retval < 0)
		bdata->pwr_reg_name = NULL;

include/linux/input/synaptics_dsx_v2_6.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ struct synaptics_dsx_board_data {
		bool y_flip;
		bool swap_axes;
		bool resume_in_workqueue;
		bool wakeup_gesture_en;
		int irq_gpio;
		int irq_on_state;
		int power_gpio;