Merge remote-tracking branch 'rajendra/platform-base-3.8.y' into av-3.8.y

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

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 4725ff7cb4bf88c6e27e2f6902eb89ff6b6ca25c..e059628714204e790b33b7d8f02dd2c6bc6ae473 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -130,6 +130,46 @@
                        #dma-requests = <127>;
                };
 
+               dss {
+                       compatible = "ti,omap4-dss";
+                       ti,hwmods = "dss_core";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       dispc {
+                               compatible = "ti,omap4-dispc";
+                               ti,hwmods = "dss_dispc";
+                       };
+
+                       dpi: dpi {
+                               compatible = "ti,omap4-dpi";
+                               video-source = <2>;
+                       };
+
+                       dsi1: dsi@0 {
+                               compatible = "ti,omap4-dsi";
+                               ti,hwmods = "dss_dsi1";
+                               reg = <0>;
+                               vdds_dsi-supply = <&vcxio>;
+                               video-source = <0>;
+                       };
+
+                       dsi2: dsi@1 {
+                               compatible = "ti,omap4-dsi";
+                               ti,hwmods = "dss_dsi2";
+                               reg = <1>;
+                               vdds_dsi-supply = <&vcxio>;
+                               video-source = <2>;
+                       };
+
+                       hdmi: hdmi {
+                               compatible = "ti,omap4-hdmi", "simple-bus";
+                               ti,hwmods = "dss_hdmi";
+                               vdda_hdmi_dac-supply = <&vdac>;
+                               video-source = <1>;
+                       };
+               };
+
                gpio1: gpio@4a310000 {
                        compatible = "ti,omap4-gpio";
                        reg = <0x4a310000 0x200>;
@@ -393,6 +433,24 @@
                        ti,hwmods = "wd_timer2";
                };
 
+               aess: aess@0x401f1000 {
+                       compatible = "ti,omap4-aess";
+                       reg = <0x401f1000 0x3ff>, /* MPU private access */
+                             <0x40180000 0xffff>, /* DMEM - MPU */
+                             <0x401a0000 0x1fff>, /* CMEM - MPU */
+                             <0x401c0000 0x5fff>, /* SMEM - MPU */
+                             <0x401e0000 0x1fff>, /* PMEM - MPU */
+                             <0x4901f000 0x3ff>, /* L3 Interconnect */
+                             <0x49080000 0xffff>, /* DMEM - MPU */
+                             <0x490a0000 0x1fff>, /* CMEM - MPU */
+                             <0x490ce000 0x5fff>, /* SMEM - MPU */
+                             <0x490e0000 0x1fff>; /* PMEM - MPU */
+                       reg-names = "mpu", "dmem", "cmem", "smem", "pmem",
+                               "dma","dmem_dma", "cmem_dma", "smem_dma", "pmem_dma";
+                       interrupts = <0 99 0x4>;
+                       ti,hwmods = "aess";
+               };
+
                mcpdm: mcpdm@40132000 {
                        compatible = "ti,omap4-mcpdm";
                        reg = <0x40132000 0x7f>, /* MPU private access */
@@ -411,6 +469,15 @@
                        ti,hwmods = "dmic";
                };
 
+               mcasp: mcasp@4012e000 {
+                       compatible = "ti,omap4-mcasp";
+                       reg = <0x40128000 0x7f>, /* MPU private access */
+                             <0x49028000 0x7f>; /* L3 Interconnect */
+                       reg-names = "mpu", "dma";
+                       interrupts = <0 109 0x4>;
+                       ti,hwmods = "mcasp";
+               };
+
                mcbsp1: mcbsp@40122000 {
                        compatible = "ti,omap4-mcbsp";
                        reg = <0x40122000 0xff>, /* MPU private access */