projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
82f901a
)
MLK-11281-1: input: keyboard: gpio_keys: add pinctl set in suspend and resume
author
Robin Gong
<b38343@freescale.com>
Tue, 16 Jun 2015 10:49:35 +0000
(18:49 +0800)
committer
Nitin Garg
<nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:48:52 +0000
(14:48 -0500)
Add pinctrl restore to support LPSR.
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit
f7d40aa30ca2fe337ba9bb8f7eaca4393db900be
)
drivers/input/keyboard/gpio_keys.c
patch
|
blob
|
history
diff --git
a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c
index
9b8079c
..
5002386
100644
(file)
--- a/
drivers/input/keyboard/gpio_keys.c
+++ b/
drivers/input/keyboard/gpio_keys.c
@@
-849,6
+849,8
@@
static int gpio_keys_suspend(struct device *dev)
mutex_unlock(&input->mutex);
}
+ pinctrl_pm_select_sleep_state(dev);
+
return 0;
}
@@
-859,6
+861,8
@@
static int gpio_keys_resume(struct device *dev)
int error = 0;
int i;
+ pinctrl_pm_select_default_state(dev);
+
if (device_may_wakeup(dev)) {
for (i = 0; i < ddata->pdata->nbuttons; i++) {
struct gpio_button_data *bdata = &ddata->data[i];