Skip to content

Commit

Permalink
Input: tegra-kbc - enable support for the standard "wakeup-source" pr…
Browse files Browse the repository at this point in the history
…operty

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>
  • Loading branch information
Sudeep Holla authored and Dmitry Torokhov committed Oct 26, 2015
1 parent ec7aa96 commit b42a114
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/input/keyboard/tegra-kbc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit b42a114

Please sign in to comment.