Merge branch 'platform-ti-linux-3.14.y' into pm-ti-linux-3.14.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 22cff5ff437e49d78410a2b1aa26d6f5c960d805..7f251c6c57488acb17b371e7ad197ed7f7c70e32 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -128,6 +128,7 @@
                prm: prm@4a306000 {
                        compatible = "ti,omap4-prm";
                        reg = <0x4a306000 0x3000>;
+                       interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
 
                        prm_clocks: clocks {
                                #address-cells = <1>;
@@ -648,6 +649,24 @@
                        };
                };
 
+               mailbox: mailbox@4a0f4000 {
+                       compatible = "ti,omap4-mailbox";
+                       reg = <0x4a0f4000 0x200>;
+                       interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                       ti,hwmods = "mailbox";
+                       #mbox-cells = <1>;
+                       ti,mbox-num-users = <3>;
+                       ti,mbox-num-fifos = <8>;
+                       mbox_ipu: mbox_ipu {
+                               ti,mbox-tx = <0 0 0>;
+                               ti,mbox-rx = <1 0 0>;
+                       };
+                       mbox_dsp: mbox_dsp {
+                               ti,mbox-tx = <3 0 0>;
+                               ti,mbox-rx = <2 0 0>;
+                       };
+               };
+
                timer1: timer@4a318000 {
                        compatible = "ti,omap3430-timer";
                        reg = <0x4a318000 0x80>;