Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[karo-tx-linux.git] / arch / arm / boot / dts / exynos4412-smdk4412.dts

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index dd564310d4a53ed1406330ce1dcae924d4ac2499..ad316a1ee9e09af700d38a435e596f1a64c9f48b 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -13,7 +13,7 @@
 */
 
 /dts-v1/;
-/include/ "exynos4412.dtsi"
+#include "exynos4412.dtsi"
 
 / {
        model = "Samsung SMDK evaluation board based on Exynos4412";
@@ -31,8 +31,91 @@
                status = "okay";
        };
 
-       g2d@10800000 {
+       pinctrl@11000000 {
+               keypad_rows: keypad-rows {
+                       samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
+                       samsung,pin-function = <3>;
+                       samsung,pin-pud = <3>;
+                       samsung,pin-drv = <0>;
+               };
+
+               keypad_cols: keypad-cols {
+                       samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
+                                      "gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
+                       samsung,pin-function = <3>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <0>;
+               };
+       };
+
+       keypad@100A0000 {
+               samsung,keypad-num-rows = <3>;
+               samsung,keypad-num-columns = <8>;
+               linux,keypad-no-autorepeat;
+               linux,keypad-wakeup;
+               pinctrl-0 = <&keypad_rows &keypad_cols>;
+               pinctrl-names = "default";
                status = "okay";
+
+               key_1 {
+                       keypad,row = <1>;
+                       keypad,column = <3>;
+                       linux,code = <2>;
+               };
+
+               key_2 {
+                       keypad,row = <1>;
+                       keypad,column = <4>;
+                       linux,code = <3>;
+               };
+
+               key_3 {
+                       keypad,row = <1>;
+                       keypad,column = <5>;
+                       linux,code = <4>;
+               };
+
+               key_4 {
+                       keypad,row = <1>;
+                       keypad,column = <6>;
+                       linux,code = <5>;
+               };
+
+               key_5 {
+                       keypad,row = <1>;
+                       keypad,column = <7>;
+                       linux,code = <6>;
+               };
+
+               key_A {
+                       keypad,row = <2>;
+                       keypad,column = <6>;
+                       linux,code = <30>;
+               };
+
+               key_B {
+                       keypad,row = <2>;
+                       keypad,column = <7>;
+                       linux,code = <48>;
+               };
+
+               key_C {
+                       keypad,row = <0>;
+                       keypad,column = <5>;
+                       linux,code = <46>;
+               };
+
+               key_D {
+                       keypad,row = <2>;
+                       keypad,column = <5>;
+                       linux,code = <32>;
+               };
+
+               key_E {
+                       keypad,row = <0>;
+                       keypad,column = <7>;
+                       linux,code = <18>;
+               };
        };
 
        sdhci@12530000 {