From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] ARM: dts: am335x/am57xx: replace gpio-key,wakeup with wakeup-source property Date: Wed, 10 Feb 2016 16:22:47 -0800 Message-ID: <20160211002247.GO19432@atomide.com> References: <1454968553-12088-1-git-send-email-sudeep.holla@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1454968553-12088-1-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Sudeep Holla Cc: =?utf-8?Q?Beno=C3=AEt?= Cousson , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org * Sudeep Holla [160208 13:57]: > Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with > wakeup-source property") replaces all the legacy "gpio-key,wakeup" wi= th > the unified "wakeup-source" property to prevent any further copy-pas= te > duplication. >=20 > However couple of use of these legacy property sneaked in during the > merge window. This patch replaces them too. >=20 > Cc: "Beno=C3=AEt Cousson" > Cc: Tony Lindgren > Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Signed-off-by: Sudeep Holla > --- > 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(-) >=20 > Hi Tony, >=20 > I see these files got introduced during v4.5 merge window and we coul= d > not stop the copy-paste from the earlier versions files from which th= ey > 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/am3= 35x-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 =3D <&gpio1 29 GPIO_ACTIVE_HIGH>; > linux,code =3D ; > debounce-interval =3D <1000>; > - gpio-key,wakeup; > + wakeup-source; > }; > =20 > front_button { > @@ -54,7 +54,7 @@ > gpios =3D <&gpio1 25 GPIO_ACTIVE_HIGH>; > linux,code =3D ; > debounce-interval =3D <1000>; > - gpio-key,wakeup; > + wakeup-source; > }; > }; > =20 > diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boo= t/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 =3D /bits/ 16 <10>; > ti,debounce-rep =3D /bits/ 16 <1>; > =20 > - linux,wakeup; > + wakeup-source; > }; > }; > =20 > --=20 > 1.9.1 >=20 -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html