summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDiogo Ferreira <defer@cyngn.com>2016-10-02 21:49:09 +0100
committerMichael Bestas <mkbestas@lineageos.org>2020-05-01 18:21:37 +0300
commitc0db21bb8d3ee403a672e6bfa932da366c64e9f6 (patch)
treeaacc174904ec04fc0928a9c5f0ac438ab1dcc92a /drivers
parent1a1279a83fd39034a3fdca21ed9064a4cd38d6b9 (diff)
input: synaptics_dsx_force: Properly setup soft button irqs on resume
If soft-buttons are disabled, their interrupt should also be disabled upon initialization. This patch reconfigures the soft-button function irqs upon suspend/resume so that the disabled state survives after coming out of suspension. Change-Id: Iec8242608754af0761ebb9f1e5ff12c2f8c7415a
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/touchscreen/synaptics_dsx_force/synaptics_dsx_core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/synaptics_dsx_force/synaptics_dsx_core.c b/drivers/input/touchscreen/synaptics_dsx_force/synaptics_dsx_core.c
index b23534981541..4f1695e01f73 100644
--- a/drivers/input/touchscreen/synaptics_dsx_force/synaptics_dsx_core.c
+++ b/drivers/input/touchscreen/synaptics_dsx_force/synaptics_dsx_core.c
@@ -188,6 +188,8 @@ static void mdss_regulator_ctrl(struct synaptics_rmi4_data *rmi4_data, unsigned
static void mdss_reset_ctrl(const struct synaptics_dsx_board_data *bdata, bool on);
static void mdss_reset_action(const struct synaptics_dsx_board_data *bdata);
+static void synaptics_key_ctrl(struct synaptics_rmi4_data *rmi4_data, bool enable);
+
#ifdef CONFIG_HAS_EARLYSUSPEND
#ifndef CONFIG_FB
#define USE_EARLYSUSPEND
@@ -2104,6 +2106,8 @@ static int synaptics_rmi4_int_enable(struct synaptics_rmi4_data *rmi4_data,
}
}
+ synaptics_key_ctrl(rmi4_data, enable && rmi4_data->button_0d_enabled);
+
return retval;
}