aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-11-05 12:21:23 -0500
committerTony Lindgren <tony@atomide.com>2014-11-05 15:17:10 -0500
commitedafb204d484835d918e74eab54e73214eedfeea (patch)
tree2cdd9a95987e46e4e17a7547b3d040970ce9b716
parent9dec11f5d813fd3755c1dce45add3afb73ee6318 (diff)
ARM: dts: Add twl keypad map for LDP
Looks like we're still missing the keypad map for LDP. Let's add it since we have the binding now available for the twl4030_keypad as otherwise we get the following errors during the boot: twl4030_keypad keypad.31: OF: linux,keymap property not defined in /ocp/i2c@48070000/twl@48/keypad twl4030_keypad keypad.31: Failed to build keymap twl4030_keypad: probe of keypad.31 failed with error -2 Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/omap3-ldp.dts21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index f7a45deaaa32..77fee3fb7515 100644
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -7,6 +7,7 @@
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9 9
10#include <dt-bindings/input/input.h>
10#include "omap34xx.dtsi" 11#include "omap34xx.dtsi"
11#include "omap-gpmc-smsc911x.dtsi" 12#include "omap-gpmc-smsc911x.dtsi"
12 13
@@ -263,6 +264,26 @@
263 }; 264 };
264}; 265};
265 266
267&twl_keypad {
268 linux,keymap = <MATRIX_KEY(0, 0, KEY_1)
269 MATRIX_KEY(0, 1, KEY_2)
270 MATRIX_KEY(0, 2, KEY_3)
271 MATRIX_KEY(1, 0, KEY_4)
272 MATRIX_KEY(1, 1, KEY_5)
273 MATRIX_KEY(1, 2, KEY_6)
274 MATRIX_KEY(1, 3, KEY_F5)
275 MATRIX_KEY(2, 0, KEY_7)
276 MATRIX_KEY(2, 1, KEY_8)
277 MATRIX_KEY(2, 2, KEY_9)
278 MATRIX_KEY(2, 3, KEY_F6)
279 MATRIX_KEY(3, 0, KEY_F7)
280 MATRIX_KEY(3, 1, KEY_0)
281 MATRIX_KEY(3, 2, KEY_F8)
282 MATRIX_KEY(5, 4, KEY_RESERVED)
283 MATRIX_KEY(4, 4, KEY_VOLUMEUP)
284 MATRIX_KEY(5, 5, KEY_VOLUMEDOWN)>;
285};
286
266&uart3 { 287&uart3 {
267 interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>; 288 interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
268}; 289};