diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 16:49:32 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 16:49:32 -0500 |
| commit | a096c88b3fbbf310eb195e5a7f521edc693b4f49 (patch) | |
| tree | 7de67e941569d27eacee59582844d82778205274 | |
| parent | ba84c80bada107b9f52bdfff147d2fbc6f4b5b54 (diff) | |
| parent | 61f1fb47bdbcf145dd539d29cfa7f3294bd5e958 (diff) | |
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>
| -rw-r--r-- | arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index 98504e0b06c8..d4af4d86c6b0 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | regulator-boot-on; | 78 | regulator-boot-on; |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | gpio-keys { | 81 | keyboard { |
| 82 | compatible = "gpio-keys"; | 82 | compatible = "gpio-keys"; |
| 83 | 83 | ||
| 84 | power-key { | 84 | power-key { |
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 830f2e87df49..bd470bafdb99 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #size-cells = <1>; | 43 | #size-cells = <1>; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | gpio_keys { | 46 | keyboard { |
| 47 | compatible = "gpio-keys"; | 47 | compatible = "gpio-keys"; |
| 48 | 48 | ||
| 49 | button@1 { | 49 | button@1 { |
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 191f32bc43ea..0d0cde7e2c41 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #size-cells = <1>; | 44 | #size-cells = <1>; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | gpio-keys { | 47 | keyboard { |
| 48 | compatible = "gpio-keys"; | 48 | compatible = "gpio-keys"; |
| 49 | 49 | ||
| 50 | key-1 { | 50 | key-1 { |
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts index 8c913d9b1824..3721cd433601 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | |||
| @@ -113,7 +113,7 @@ | |||
| 113 | }; | 113 | }; |
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | gpio-keys { | 116 | keyboard { |
| 117 | compatible = "gpio-keys"; | 117 | compatible = "gpio-keys"; |
| 118 | 118 | ||
| 119 | back-key { | 119 | back-key { |