[PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property

[PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property

[Sudeep Holla]

Though the mmc core driver should/will continue to support the legacy
"nvidia,wakeup-source" property to enable SDIO 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.

Cc: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-input@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/input/keyboard/tegra-kbc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)) {
-- 
1.9.1

Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property

[Dmitry Torokhov]

On Wed, Oct 21, 2015 at 11:10:03AM +0100, Sudeep Holla wrote:
> Though the mmc core driver should/will continue to support the legacy
> "nvidia,wakeup-source" property to enable SDIO 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.
> 
> Cc: Laxman Dewangan <ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Cc: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Signed-off-by: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>

Applied, thank you.

> ---
>  drivers/input/keyboard/tegra-kbc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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)) {
> -- 
> 1.9.1
> 

-- 
Dmitry

Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property

[Sudeep Holla]

On 23/10/15 07:39, Dmitry Torokhov wrote:
> On Wed, Oct 21, 2015 at 11:10:03AM +0100, Sudeep Holla wrote:
>> Though the mmc core driver should/will continue to support the legacy
>> "nvidia,wakeup-source" property to enable SDIO 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.
>>
>> Cc: Laxman Dewangan <ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>> Cc: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Cc: linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> Signed-off-by: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>
>
> Applied, thank you.
>

Thanks, but I think I sent out a old copy which had unrelated commit
message because of copy-paste. *Sorry for that*. Can you update it
something like:

"
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.
"
-- 
Regards,
Sudeep
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property

[Dmitry Torokhov]

On Fri, Oct 23, 2015 at 11:23:51AM +0100, Sudeep Holla wrote:
> 
> 
> On 23/10/15 07:39, Dmitry Torokhov wrote:
> >On Wed, Oct 21, 2015 at 11:10:03AM +0100, Sudeep Holla wrote:
> >>Though the mmc core driver should/will continue to support the legacy
> >>"nvidia,wakeup-source" property to enable SDIO 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.
> >>
> >>Cc: Laxman Dewangan <ldewangan@nvidia.com>
> >>Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> >>Cc: Thierry Reding <thierry.reding@gmail.com>
> >>Cc: linux-input@vger.kernel.org
> >>Cc: linux-tegra@vger.kernel.org
> >>Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> >
> >Applied, thank you.
> >
> 
> Thanks, but I think I sent out a old copy which had unrelated commit
> message because of copy-paste. *Sorry for that*. Can you update it
> something like:
> 
> "
> 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.
> "

Thanks, I replaced the description with what you supplied.

-- 
Dmitry