summaryrefslogtreecommitdiff
path: root/include/linux/input
diff options
context:
space:
mode:
authorzhaoyuan <yzhao@codeaurora.org>2016-03-24 10:36:00 +0800
committerAbinaya P <abinayap@codeaurora.org>2016-08-24 16:50:27 +0530
commitb378a2f8ba08d3c529ccb7ed4b64d2b686543735 (patch)
treea97910625c9506f8ffaa6a054425c7795f7547eb /include/linux/input
parenta0732e6085b0b0f62444edf5b4d0e076de130d6b (diff)
input: synaptics: defer touch resume to workqueue for v2.6 driver
During device resume, the touch resume function is called after display resume. Touch resume function will take about >200ms. Defer the touch resume function to a workqueue to reduce the total device resume time. An optional DT property is added to enable this on targets that need this feature. This change has been merged. Now, touch driver was updated to V2.6, so, merge this change to V2.6 driver. Change-Id: Ica477f35bd4fda59eb49c9b4f5e88b460366c761 Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
Diffstat (limited to 'include/linux/input')
-rw-r--r--include/linux/input/synaptics_dsx_v2_6.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/input/synaptics_dsx_v2_6.h b/include/linux/input/synaptics_dsx_v2_6.h
index 2b91bc043f6f..5d4bbedb5f1a 100644
--- a/include/linux/input/synaptics_dsx_v2_6.h
+++ b/include/linux/input/synaptics_dsx_v2_6.h
@@ -5,6 +5,7 @@
*
* Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com>
* Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com>
+ * Copyright (C) 2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -57,6 +58,7 @@ struct synaptics_dsx_button_map {
* @x_flip: x flip flag
* @y_flip: y flip flag
* @swap_axes: swap axes flag
+ * @resume_in_workqueue: defer resume function to workqueue
* @irq_gpio: attention interrupt GPIO
* @irq_on_state: attention interrupt active state
* @power_gpio: power switch GPIO
@@ -79,11 +81,13 @@ struct synaptics_dsx_button_map {
* @bus_reg_name: pointer to name of regulator for bus pullup control
* @cap_button_map: pointer to 0D button map
* @vir_button_map: pointer to virtual button map
+ * @resume_in_workqueue: defer resume function to workqueue
*/
struct synaptics_dsx_board_data {
bool x_flip;
bool y_flip;
bool swap_axes;
+ bool resume_in_workqueue;
int irq_gpio;
int irq_on_state;
int power_gpio;