Merge branch 'omap5_audio_video-3.8.y' into ti-linux-3.8.y

[android-sdk/kernel-video.git] / arch / arm / boot / dts / omap4-panda.dts

diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
index 65a8d0b90d11f9c39767abf031cab543e061f4cd..0a1ec1791063d2003b5c9233abca65d5529c4a26 100644 (file)
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -41,9 +41,13 @@
                ti,mclk-freq = <38400000>;
 
                ti,mcpdm = <&mcpdm>;
+               ti,mcbsp1 = <&mcbsp1>;
+               ti,mcbsp2 = <&mcbsp2>;
+               ti,aess = <&aess>;
 
                ti,twl6040 = <&twl6040>;
 
+
                /* Audio routing */
                ti,audio-routing =
                        "Headset Stereophone", "HSOL",
@@ -55,7 +59,22 @@
                        "HSMIC", "Headset Mic",
                        "Headset Mic", "Headset Mic Bias",
                        "AFML", "Line In",
-                       "AFMR", "Line In";
+                       "AFMR", "Line In",
+                       "Headset Playback", "PDM_DL1",
+                       "Handsfree Playback", "PDM_DL2",
+                       "PDM_UL1", "Capture",
+                       "40122000.mcbsp Playback", "BT_VX_DL",
+                       "BT_VX_UL", "40122000.mcbsp Capture",
+                       "40124000.mcbsp Playback", "MM_EXT_DL",
+                       "MM_EXT_UL", "40124000.mcbsp Capture";
+       };
+
+       sound_hdmi {
+               compatible = "ti,omap-hdmi-tpd12s015-audio";
+               ti,model = "OMAP4HDMI";
+
+               ti,hdmi_audio = <&hdmi>;
+               ti,level_shifter = <&tpd12s015>;
        };
 
        /* HS USB Port 1 RESET */
@@ -239,7 +258,6 @@
 
        twl6040: twl@4b {
                compatible = "ti,twl6040";
-               reg = <0x4b>;
                /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
                interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */
                interrupt-parent = <&gic>;
@@ -252,6 +270,7 @@
 };
 
 /include/ "twl6030.dtsi"
+/include/ "twl6040.dtsi"
 
 &i2c2 {
        pinctrl-names = "default";
@@ -319,10 +338,6 @@
        device-handle = <&elpida_ECB240ABACN>;
 };
 
-&mcbsp2 {
-       status = "disabled";
-};
-
 &mcbsp3 {
        status = "disabled";
 };
@@ -331,6 +346,30 @@
        status = "disabled";
 };
 
+&dpi {
+       dvi {
+               compatible = "ti,tfp410";
+               data-lines = <24>;
+               gpios = <&gpio1 0 0>;   /* 0, power-down */
+               i2c-bus = <&i2c3>;
+       };
+};
+
+&hdmi {
+       tpd12s015: tpd12s015 {
+               compatible = "ti,tpd12s015";
+
+               gpios = <&gpio2 28 0>,  /* 60, CT CP HPD */
+                       <&gpio2 9 0>,   /* 41, LS OE */
+                       <&gpio2 31 0>;  /* 63, HPD */
+
+               hdmi {
+                       compatible = "ti,hdmi_panel";
+               };
+
+       };
+};
+
 &twl_usb_comparator {
        usb-supply = <&vusb>;
 };