Commit a096c88b authored Nov 19, 2014 by Arnd Bergmann

Merge tag 'renesas-dt-cleanups3-for-v3.19' of...

Merge tag 'renesas-dt-cleanups3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Third Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Use keyboard as gpio-keys node name

* tag 'renesas-dt-cleanups3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: kzm9g-reference: Use keyboard as gpio-keys node name
  ARM: shmobile: koelsch: Use keyboard as gpio-keys node name
  ARM: shmobile: lager: Use keyboard as gpio-keys node name
  ARM: shmobile: armadillo800eva: Use keyboard as gpio-keys node name

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents ba84c80b 61f1fb47

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@
		regulator-boot-on;
		};

		gpio-keys {
		keyboard {
		compatible = "gpio-keys";

		power-key {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@
		#size-cells = <1>;
		};

		gpio_keys {
		keyboard {
		compatible = "gpio-keys";

		button@1 {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		#size-cells = <1>;
		};

		gpio-keys {
		keyboard {
		compatible = "gpio-keys";

		key-1 {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@
		};
		};

		gpio-keys {
		keyboard {
		compatible = "gpio-keys";

		back-key {

Admin message