Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / omap3-ldp.dts

diff --git a/arch/arm/boot/dts/omap3-ldp.dts b/arch/arm/boot/dts/omap3-ldp.dts
index 202f95a5a3837b4a52b0d084de28634b9e340771..b699bc48f242ef33cf7c390e3a4002a4a1ac3a31 100644 (file)
--- a/arch/arm/boot/dts/omap3-ldp.dts
+++ b/arch/arm/boot/dts/omap3-ldp.dts
@@ -7,6 +7,7 @@
  */
 /dts-v1/;
 
+#include <dt-bindings/input/input.h>
 #include "omap34xx.dtsi"
 #include "omap-gpmc-smsc911x.dtsi"
 
@@ -142,7 +143,7 @@
                };
                partition@2000000 {
                        label = "Filesystem";
-                       reg = <0x2000000 0xe000000>;
+                       reg = <0x2000000 0x6000000>;
                };
        };
 
@@ -264,6 +265,26 @@
        };
 };
 
+&twl_keypad {
+       linux,keymap = <MATRIX_KEY(0, 0, KEY_1)
+                       MATRIX_KEY(0, 1, KEY_2)
+                       MATRIX_KEY(0, 2, KEY_3)
+                       MATRIX_KEY(1, 0, KEY_4)
+                       MATRIX_KEY(1, 1, KEY_5)
+                       MATRIX_KEY(1, 2, KEY_6)
+                       MATRIX_KEY(1, 3, KEY_F5)
+                       MATRIX_KEY(2, 0, KEY_7)
+                       MATRIX_KEY(2, 1, KEY_8)
+                       MATRIX_KEY(2, 2, KEY_9)
+                       MATRIX_KEY(2, 3, KEY_F6)
+                       MATRIX_KEY(3, 0, KEY_F7)
+                       MATRIX_KEY(3, 1, KEY_0)
+                       MATRIX_KEY(3, 2, KEY_F8)
+                       MATRIX_KEY(5, 4, KEY_RESERVED)
+                       MATRIX_KEY(4, 4, KEY_VOLUMEUP)
+                       MATRIX_KEY(5, 5, KEY_VOLUMEDOWN)>;
+};
+
 &uart3 {
        interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
 };