Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio

[cascardo/linux.git] / arch / arm / boot / dts / stih41x-b2000.dtsi

diff --git a/arch/arm/boot/dts/stih41x-b2000.dtsi b/arch/arm/boot/dts/stih41x-b2000.dtsi
index bf65c49..b3dd6ca 100644 (file)
--- a/arch/arm/boot/dts/stih41x-b2000.dtsi
+++ b/arch/arm/boot/dts/stih41x-b2000.dtsi
@@ -6,6 +6,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * publishhed by the Free Software Foundation.
  */
+#include <dt-bindings/input/input.h>
 / {
 
        memory{
@@ -14,7 +15,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyAS0,115200";
+               bootargs = "console=ttyAS0,115200 clk_ignore_unused";
                linux,stdout-path = &serial2;
        };
 
@@ -68,5 +69,27 @@
                        snps,reset-active-low;
                        snps,reset-delays-us    = <0 10000 10000>;
                };
+
+               keyscan: keyscan@fe4b0000 {
+                       keypad,num-rows = <4>;
+                       keypad,num-columns = <4>;
+                       st,debounce-us = <5000>;
+                       linux,keymap = < MATRIX_KEY(0x00, 0x00, KEY_F13)
+                                        MATRIX_KEY(0x00, 0x01, KEY_F9)
+                                        MATRIX_KEY(0x00, 0x02, KEY_F5)
+                                        MATRIX_KEY(0x00, 0x03, KEY_F1)
+                                        MATRIX_KEY(0x01, 0x00, KEY_F14)
+                                        MATRIX_KEY(0x01, 0x01, KEY_F10)
+                                        MATRIX_KEY(0x01, 0x02, KEY_F6)
+                                        MATRIX_KEY(0x01, 0x03, KEY_F2)
+                                        MATRIX_KEY(0x02, 0x00, KEY_F15)
+                                        MATRIX_KEY(0x02, 0x01, KEY_F11)
+                                        MATRIX_KEY(0x02, 0x02, KEY_F7)
+                                        MATRIX_KEY(0x02, 0x03, KEY_F3)
+                                        MATRIX_KEY(0x03, 0x00, KEY_F16)
+                                        MATRIX_KEY(0x03, 0x01, KEY_F12)
+                                        MATRIX_KEY(0x03, 0x02, KEY_F8)
+                                        MATRIX_KEY(0x03, 0x03, KEY_F4) >;
+               };
        };
 };