| Message ID | 1445422216-29375-10-git-send-email-sudeep.holla@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21/10/15 11:10, Sudeep Holla wrote: > Though the keyboard driver for GPIO buttons(gpio-keys) will continue to > check for/support the legacy "gpio-key,wakeup" boolean property to > enable gpio buttons as wakeup source, "wakeup-source" is the new > standard binding. > > This patch replaces the legacy "gpio-key,wakeup" with the unified > "wakeup-source" property in order to avoid any futher copy-paste > duplication. > > Cc: "Benoît Cousson" <bcousson@baylibre.com> > Cc: Tony Lindgren <tony@atomide.com> Ping, do you prefer taking via your tree or should I send to armsoc directly ?
* Sudeep Holla <sudeep.holla@arm.com> [151215 08:33]: > > > On 21/10/15 11:10, Sudeep Holla wrote: > >Though the keyboard driver for GPIO buttons(gpio-keys) will continue to > >check for/support the legacy "gpio-key,wakeup" boolean property to > >enable gpio buttons as wakeup source, "wakeup-source" is the new > >standard binding. > > > >This patch replaces the legacy "gpio-key,wakeup" with the unified > >"wakeup-source" property in order to avoid any futher copy-paste > >duplication. > > > >Cc: "Benoît Cousson" <bcousson@baylibre.com> > >Cc: Tony Lindgren <tony@atomide.com> > > Ping, do you prefer taking via your tree or should I send to armsoc > directly ? Sorry I did not realized you're waiting for me to pick this one, applying into omap-for-v4.5/dt thanks. Tony
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 1942a5c8132d..a6e398a213ec 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -83,14 +83,14 @@ label = "volume-up"; linux,code = <115>; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; switch@10 { label = "volume-down"; linux,code = <114>; gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; }; diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 315bb02c9920..6b57baaa2bb0 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -123,7 +123,7 @@ label = "button2"; linux,code = <0x102>; gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; - gpio-key,wakeup; + wakeup-source; }; switch@4 { diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts index 7106114c7464..5107dbb07a7d 100644 --- a/arch/arm/boot/dts/am335x-pepper.dts +++ b/arch/arm/boot/dts/am335x-pepper.dts @@ -627,21 +627,21 @@ label = "home"; linux,code = <KEY_HOME>; gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; button@1 { label = "menu"; linux,code = <KEY_MENU>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; buttons@2 { label = "power"; linux,code = <KEY_POWER>; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; }; };
Though the keyboard driver for GPIO buttons(gpio-keys) will continue to check for/support the legacy "gpio-key,wakeup" boolean property to enable gpio buttons as wakeup source, "wakeup-source" is the new standard binding. This patch replaces the legacy "gpio-key,wakeup" with the unified "wakeup-source" property in order to avoid any futher copy-paste duplication. Cc: "Benoît Cousson" <bcousson@baylibre.com> Cc: Tony Lindgren <tony@atomide.com> Cc: linux-omap@vger.kernel.org Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- arch/arm/boot/dts/am335x-evm.dts | 4 ++-- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)