From 26cefdd15db1ebdcc564a23f21e3359342f71bde Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Wed, 21 Oct 2015 11:10:08 +0100 Subject: ARM: dts: imx: replace legacy wakeup property with 'wakeup-source' Though the keyboard and other driver will continue to support the legacy "gpio-key,wakeup", "linux,wakeup" and "enable-sdio-wakeup" boolean property to enable the wakeup source, "wakeup-source" is the new standard binding. This patch replaces all the legacy wakeup properties with the unified "wakeup-source" property in order to avoid any futher copy-paste duplication. Cc: Sascha Hauer Signed-off-by: Sudeep Holla Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx53-qsb-common.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts/imx53-qsb-common.dtsi') diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index 53fd75c8ffcf..368ccd0a053e 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi @@ -67,14 +67,14 @@ label = "Volume Up"; gpios = <&gpio2 14 0>; linux,code = <115>; /* KEY_VOLUMEUP */ - gpio-key,wakeup; + wakeup-source; }; volume-down { label = "Volume Down"; gpios = <&gpio2 15 0>; linux,code = <114>; /* KEY_VOLUMEDOWN */ - gpio-key,wakeup; + wakeup-source; }; }; -- cgit From 3631c597ca33df06610a5482447912d36d0a9ff2 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 1 Mar 2016 08:14:02 +0100 Subject: ARM: dts: imx53-qsb: Fix gpio button polarity The polarity of the gpio buttons is defined to '0' which is active high. The buttons are active low though which has been verified by testing it and by looking into the schematics. While at it use defines rathers than numbers for the key codes. Signed-off-by: Sascha Hauer Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx53-qsb-common.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/boot/dts/imx53-qsb-common.dtsi') diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index 368ccd0a053e..c05e7cfd0cbc 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi @@ -59,21 +59,21 @@ power { label = "Power Button"; - gpios = <&gpio1 8 0>; - linux,code = <116>; /* KEY_POWER */ + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + linux,code = ; }; volume-up { label = "Volume Up"; - gpios = <&gpio2 14 0>; - linux,code = <115>; /* KEY_VOLUMEUP */ + gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; + linux,code = ; wakeup-source; }; volume-down { label = "Volume Down"; - gpios = <&gpio2 15 0>; - linux,code = <114>; /* KEY_VOLUMEDOWN */ + gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; + linux,code = ; wakeup-source; }; }; -- cgit