Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc16889 authored Oct 21, 2015 by Sudeep Holla Committed by Simon Horman Oct 23, 2015

ARM: dts: shmobile/r8a7xxx: replace gpio-key, wakeup with wakeup-source property



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.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent 761b11e1

arch/arm/boot/dts/r8a73a4-ape6evm.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@
		gpios = <&pfc 324 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_0>;
		label = "S16";
		gpio-key,wakeup;
		wakeup-source;
		};

		menu-key {

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@
		gpios = <&pfc 99 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_POWER>;
		label = "SW3";
		gpio-key,wakeup;
		wakeup-source;
		};

		back-key {

arch/arm/boot/dts/r8a7790-lager.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -77,28 +77,28 @@
		button@1 {
		linux,code = <KEY_1>;
		label = "SW2-1";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
		};
		button@2 {
		linux,code = <KEY_2>;
		label = "SW2-2";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
		};
		button@3 {
		linux,code = <KEY_3>;
		label = "SW2-3";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
		};
		button@4 {
		linux,code = <KEY_4>;
		label = "SW2-4";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
		};

arch/arm/boot/dts/r8a7791-koelsch.dts

+11 −11

Original line number	Diff line number	Diff line
		@@ -79,77 +79,77 @@
		gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_1>;
		label = "SW2-1";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-2 {
		gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_2>;
		label = "SW2-2";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-3 {
		gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_3>;
		label = "SW2-3";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-4 {
		gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_4>;
		label = "SW2-4";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-a {
		gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_A>;
		label = "SW30";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-b {
		gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_B>;
		label = "SW31";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-c {
		gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_C>;
		label = "SW32";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-d {
		gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_D>;
		label = "SW33";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-e {
		gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_E>;
		label = "SW34";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-f {
		gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_F>;
		label = "SW35";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		key-g {
		gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_G>;
		label = "SW36";
		gpio-key,wakeup;
		wakeup-source;
		debounce-interval = <20>;
		};
		};

arch/arm/boot/dts/sh73a0-kzm9g.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@
		gpios = <&pcf8575 14 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_HOME>;
		label = "SW1";
		gpio-key,wakeup;
		wakeup-source;
		};
		};