summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2015-10-23 09:38:40 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-10-26 11:26:59 +0300
commitb42a1148de452ab1a3ee15caac2960a063e28f03 (patch)
tree2db3a32d21bdf69a7b478900fa0ad4406901095f /drivers/input
parentec7aa963bf81803b70b7da71bf79943ae5b9c531 (diff)
downloadlinux-b42a1148de452ab1a3ee15caac2960a063e28f03.tar.xz
Input: tegra-kbc - enable support for the standard "wakeup-source" property
Though the tegra-kbc driver should/will continue to support the legacy "nvidia,wakeup-source" property to enable keyboard as the wakeup source, we need to add support for the new standard property "wakeup-source". This patch adds support for "wakeup-source" property in addition to the existing "nvidia,wakeup-source" property. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/tegra-kbc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index f97c73bd14f8..f80c72d4ac8f 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -517,7 +517,8 @@ static int tegra_kbc_parse_dt(struct tegra_kbc *kbc)
if (of_find_property(np, "nvidia,needs-ghost-filter", NULL))
kbc->use_ghost_filter = true;
- if (of_find_property(np, "nvidia,wakeup-source", NULL))
+ if (of_property_read_bool(np, "wakeup-source") ||
+ of_property_read_bool(np, "nvidia,wakeup-source")) /* legacy */
kbc->wakeup = true;
if (!of_get_property(np, "nvidia,kbc-row-pins", &proplen)) {