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

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

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index ef5f923b086c035157dc19297569c0bf4b0757c8..f01809bc1119f7e0f23995ccef9e718206075701 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -299,6 +299,7 @@
                        reg = <0x48040000 0x400>;
                        interrupts = <68>;
                        ti,hwmods = "timer2";
+                       ti,timer-non-wkup;
                };
 
                timer3: timer@48042000 {
@@ -468,5 +469,20 @@
                                &edma 5>;
                        dma-names = "tx", "rx";
                };
+
+               ocmcram: ocmcram@40300000 {
+                       compatible = "ti,am3352-ocmcram";
+                       reg = <0x40300000 0x10000>;
+                       ti,hwmods = "ocmcram";
+                       ti,no_idle_on_suspend;
+               };
+
+               wkup_m3: wkup_m3@44d00000 {
+                       compatible = "ti,am3353-wkup-m3";
+                       reg = <0x44d00000 0x4000        /* M3 UMEM */
+                              0x44d80000 0x2000>;      /* M3 DMEM */
+                       interrupts = <78>;
+                       ti,hwmods = "wkup_m3";
+               };
        };
 };