Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / boot / dts / omap3-cm-t3x30.dtsi

diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index 25ba083..9a4a3ab 100644 (file)
--- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -10,6 +10,14 @@
                        cpu0-supply = <&vcc>;
                };
        };
+
+       sound {
+               compatible = "ti,omap-twl4030";
+               ti,model = "cm-t35";
+
+               ti,mcbsp = <&mcbsp2>;
+               ti,codec = <&twl_audio>;
+       };
 };
 
 &omap3_pmx_core {
@@ -59,11 +67,22 @@
                reg = <0x48>;
                interrupts = <7>; /* SYS_NIRQ cascaded to intc */
                interrupt-parent = <&intc>;
+
+               twl_audio: audio {
+                       compatible = "ti,twl4030-audio";
+                       codec {
+                       };
+               };
        };
 };
 
 #include "twl4030.dtsi"
 #include "twl4030_omap3.dtsi"
+#include <dt-bindings/input/input.h>
+
+&venc {
+       vdda-supply = <&vdac>;
+};
 
 &mmc1 {
        vmmc-supply = <&vmmc1>;
@@ -75,6 +94,22 @@
        ti,pullups = <0x000001>;
 };
 
+&twl_keypad {
+       linux,keymap = <
+                               MATRIX_KEY(0x00, 0x01, KEY_A)
+                               MATRIX_KEY(0x00, 0x02, KEY_B)
+                               MATRIX_KEY(0x00, 0x03, KEY_LEFT)
+
+                               MATRIX_KEY(0x01, 0x01, KEY_UP)
+                               MATRIX_KEY(0x01, 0x02, KEY_ENTER)
+                               MATRIX_KEY(0x01, 0x03, KEY_DOWN)
+
+                               MATRIX_KEY(0x02, 0x01, KEY_RIGHT)
+                               MATRIX_KEY(0x02, 0x02, KEY_C)
+                               MATRIX_KEY(0x02, 0x03, KEY_D)
+                       >;
+};
+
 &hsusb1_phy {
        reset-gpios = <&twl_gpio 6 GPIO_ACTIVE_LOW>;
 };