From: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
To: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>
Cc: "Benoît Cousson"
<bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] ARM: dts: am335x/am57xx: replace gpio-key,wakeup with wakeup-source property
Date: Wed, 10 Feb 2016 16:22:47 -0800 [thread overview]
Message-ID: <20160211002247.GO19432@atomide.com> (raw)
In-Reply-To: <1454968553-12088-1-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org>
* Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org> [160208 13:57]:
> Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with
> wakeup-source property") replaces all the legacy "gpio-key,wakeup" with
> the unified "wakeup-source" property to prevent any further copy-paste
> duplication.
>
> However couple of use of these legacy property sneaked in during the
> merge window. This patch replaces them too.
>
> Cc: "Benoît Cousson" <bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
> Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Signed-off-by: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>
> ---
> arch/arm/boot/dts/am335x-shc.dts | 4 ++--
> arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> Hi Tony,
>
> I see these files got introduced during v4.5 merge window and we could
> not stop the copy-paste from the earlier versions files from which they
> were copied.
OK thanks for checking, applying this into omap-for-v4.5/fixes.
Regards,
Tony
> diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
> index 1b5b044fcd91..865de8500f1c 100644
> --- a/arch/arm/boot/dts/am335x-shc.dts
> +++ b/arch/arm/boot/dts/am335x-shc.dts
> @@ -46,7 +46,7 @@
> gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
> linux,code = <KEY_BACK>;
> debounce-interval = <1000>;
> - gpio-key,wakeup;
> + wakeup-source;
> };
>
> front_button {
> @@ -54,7 +54,7 @@
> gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
> linux,code = <KEY_FRONT>;
> debounce-interval = <1000>;
> - gpio-key,wakeup;
> + wakeup-source;
> };
> };
>
> diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> index c53882643ae9..497eb07ced19 100644
> --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> @@ -545,7 +545,7 @@
> ti,debounce-tol = /bits/ 16 <10>;
> ti,debounce-rep = /bits/ 16 <1>;
>
> - linux,wakeup;
> + wakeup-source;
> };
> };
>
> --
> 1.9.1
>
--
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
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: dts: am335x/am57xx: replace gpio-key,wakeup with wakeup-source property
Date: Wed, 10 Feb 2016 16:22:47 -0800 [thread overview]
Message-ID: <20160211002247.GO19432@atomide.com> (raw)
In-Reply-To: <1454968553-12088-1-git-send-email-sudeep.holla@arm.com>
* Sudeep Holla <sudeep.holla@arm.com> [160208 13:57]:
> Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with
> wakeup-source property") replaces all the legacy "gpio-key,wakeup" with
> the unified "wakeup-source" property to prevent any further copy-paste
> duplication.
>
> However couple of use of these legacy property sneaked in during the
> merge window. This patch replaces them too.
>
> Cc: "Beno?t Cousson" <bcousson@baylibre.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap at vger.kernel.org
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
> arch/arm/boot/dts/am335x-shc.dts | 4 ++--
> arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> Hi Tony,
>
> I see these files got introduced during v4.5 merge window and we could
> not stop the copy-paste from the earlier versions files from which they
> were copied.
OK thanks for checking, applying this into omap-for-v4.5/fixes.
Regards,
Tony
> diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
> index 1b5b044fcd91..865de8500f1c 100644
> --- a/arch/arm/boot/dts/am335x-shc.dts
> +++ b/arch/arm/boot/dts/am335x-shc.dts
> @@ -46,7 +46,7 @@
> gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
> linux,code = <KEY_BACK>;
> debounce-interval = <1000>;
> - gpio-key,wakeup;
> + wakeup-source;
> };
>
> front_button {
> @@ -54,7 +54,7 @@
> gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
> linux,code = <KEY_FRONT>;
> debounce-interval = <1000>;
> - gpio-key,wakeup;
> + wakeup-source;
> };
> };
>
> diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> index c53882643ae9..497eb07ced19 100644
> --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> @@ -545,7 +545,7 @@
> ti,debounce-tol = /bits/ 16 <10>;
> ti,debounce-rep = /bits/ 16 <1>;
>
> - linux,wakeup;
> + wakeup-source;
> };
> };
>
> --
> 1.9.1
>
next prev parent reply other threads:[~2016-02-11 0:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 21:55 [PATCH] ARM: dts: am335x/am57xx: replace gpio-key,wakeup with wakeup-source property Sudeep Holla
2016-02-08 21:55 ` [PATCH] ARM: dts: am335x/am57xx: replace gpio-key, wakeup " Sudeep Holla
[not found] ` <1454968553-12088-1-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org>
2016-02-11 0:22 ` Tony Lindgren [this message]
2016-02-11 0:22 ` [PATCH] ARM: dts: am335x/am57xx: replace gpio-key,wakeup " Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160211002247.GO19432@atomide.com \
--to=tony-4v6ys6ai5vpbdgjk7y7tuq@public.gmane.org \
--cc=bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=sudeep.holla-5wv7dgnIgG8@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.