Merge branch 'armsoc/for-3.11/dt' of git://github.com/broadcom/bcm11351 into next/dt

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos4412-origen.dts

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 1c21bad32ca9090c9673b2d68dabba20a2e563a1..ca73c42f77e1ae25742a4baef1172705533d3662 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -36,6 +36,72 @@
                enable-active-high;
        };
 
+       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";
+                       samsung,pin-function = <3>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <0>;
+               };
+       };
+
+       keypad@100A0000 {
+               samsung,keypad-num-rows = <3>;
+               samsung,keypad-num-columns = <2>;
+               linux,keypad-no-autorepeat;
+               linux,keypad-wakeup;
+               pinctrl-0 = <&keypad_rows &keypad_cols>;
+               pinctrl-names = "default";
+               status = "okay";
+
+               key_home {
+                       keypad,row = <0>;
+                       keypad,column = <0>;
+                       linux,code = <102>;
+               };
+
+               key_down {
+                       keypad,row = <0>;
+                       keypad,column = <1>;
+                       linux,code = <108>;
+               };
+
+               key_up {
+                       keypad,row = <1>;
+                       keypad,column = <0>;
+                       linux,code = <103>;
+               };
+
+               key_menu {
+                       keypad,row = <1>;
+                       keypad,column = <1>;
+                       linux,code = <139>;
+               };
+
+               key_back {
+                       keypad,row = <2>;
+                       keypad,column = <0>;
+                       linux,code = <158>;
+               };
+
+               key_enter {
+                       keypad,row = <2>;
+                       keypad,column = <1>;
+                       linux,code = <28>;
+               };
+       };
+
+       g2d@10800000 {
+               status = "okay";
+       };
+
        sdhci@12530000 {
                bus-width = <4>;
                pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;