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
commit8cf747f1e1001673a34292bd3dddbe6bb2817e0b (patch)
tree772479ecef37edcbb08e9c08ae0e9fd200edd52d
parentedafb204d484835d918e74eab54e73214eedfeea (diff)
ARM: dts: Add twl keypad map for omap3 EVM
Looks like we're still missing the keypad map for EVM. 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 Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/omap3-evm-common.dtsi21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi
index c8747c7f1cc8..127f3e7c10c4 100644
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -2,6 +2,7 @@
2 * Common support for omap3 EVM boards 2 * Common support for omap3 EVM boards
3 */ 3 */
4 4
5#include <dt-bindings/input/input.h>
5#include "omap-gpmc-smsc911x.dtsi" 6#include "omap-gpmc-smsc911x.dtsi"
6 7
7/ { 8/ {
@@ -111,6 +112,26 @@
111 ti,use-leds; 112 ti,use-leds;
112}; 113};
113 114
115&twl_keypad {
116 linux,keymap = <
117 MATRIX_KEY(2, 2, KEY_1)
118 MATRIX_KEY(1, 1, KEY_2)
119 MATRIX_KEY(0, 0, KEY_3)
120 MATRIX_KEY(3, 2, KEY_4)
121 MATRIX_KEY(2, 1, KEY_5)
122 MATRIX_KEY(1, 0, KEY_6)
123 MATRIX_KEY(1, 3, KEY_7)
124 MATRIX_KEY(3, 1, KEY_8)
125 MATRIX_KEY(2, 0, KEY_9)
126 MATRIX_KEY(2, 3, KEY_KPASTERISK)
127 MATRIX_KEY(0, 2, KEY_0)
128 MATRIX_KEY(3, 0, KEY_KPDOT)
129 /* s4 not wired */
130 MATRIX_KEY(1, 2, KEY_BACKSPACE)
131 MATRIX_KEY(0, 1, KEY_ENTER)
132 >;
133};
134
114&usb_otg_hs { 135&usb_otg_hs {
115 interface-type = <0>; 136 interface-type = <0>;
116 usb-phy = <&usb2_phy>; 137 usb-phy = <&usb2_phy>;