summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorAshwini Ghuge <aghuge@nvidia.com>2012-01-30 16:34:18 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-02-03 05:40:29 -0800
commit6e4900f78de77aa5336ca2212122d978fd0057eb (patch)
tree719c4f69a219345e70683e2508c99364995ffef4 /drivers/input
parent85159eb4d30d947d26a23852944dc85c663f9ee2 (diff)
input: tegra: kbc: KP INT EN when scantimeout zero
Enable wake from LP1 on KP interrupt when scan timeout is set to zero. Bug 921161 Reviewed-on: http://git-master/r/78146 Change-Id: I6f28f0da971bd159b40412608fca2615a70f6988 Signed-off-by: Ashwini Ghuge <aghuge@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78700 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/tegra-kbc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 24f81d9d26d2..01ee74852368 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -48,6 +48,7 @@
#define KBC_DEBOUNCE_CNT_SHIFT(cnt) (cnt << 4)
#define KBC_CONTROL_FIFO_CNT_INT_EN (1 << 3)
#define KBC_CONTROL_KBC_EN (1 << 0)
+#define KBC_CONTROL_KP_INT_EN (1<<1)
/* KBC Interrupt Register */
#define KBC_INT_0 0x4
@@ -500,6 +501,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)
val |= KBC_FIFO_TH_CNT_SHIFT(1); /* set fifo interrupt threshold to 1 */
val |= KBC_CONTROL_FIFO_CNT_INT_EN; /* interrupt on FIFO threshold */
val |= KBC_CONTROL_KBC_EN; /* enable */
+ val |= KBC_CONTROL_KP_INT_EN;
writel(val, kbc->mmio + KBC_CONTROL_0);
writel(DEFAULT_INIT_DLY, kbc->mmio + KBC_INIT_DLY_0);