Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / am4372.dtsi

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 964f3ef797289e2cfb3dd13291556aed35649719..f0cbd86312dce5ddc1867d9eb2dc54059450a090 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -92,6 +92,16 @@
                };
        };
 
+       soc {
+               compatible = "ti,omap-infra";
+               mpu {
+                       compatible = "ti,omap4-mpu";
+                       ti,hwmods = "mpu";
+                       pm-sram = <&pm_sram_code
+                                  &pm_sram_data>;
+               };
+       };
+
        gic: interrupt-controller@48241000 {
                compatible = "arm,cortex-a9-gic";
                interrupt-controller;
@@ -143,6 +153,7 @@
                #size-cells = <1>;
                ranges;
                ti,hwmods = "l3_main";
+               ti,no-idle;
                reg = <0x44000000 0x400000
                       0x44800000 0x400000>;
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
@@ -237,6 +248,10 @@
                        compatible = "ti,emif-am4372";
                        reg = <0x4c000000 0x1000000>;
                        ti,hwmods = "emif";
+                       interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                       ti,no-idle;
+                       sram = <&pm_sram_code
+                               &pm_sram_data>;
                };
 
                edma: edma@49000000 {
@@ -1141,6 +1156,21 @@
                ocmcram: ocmcram@40300000 {
                        compatible = "mmio-sram";
                        reg = <0x40300000 0x40000>; /* 256k */
+                       ranges = <0x0 0x40300000 0x40000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       pm_sram_code: pm-sram-code@0 {
+                               compatible = "ti,sram";
+                               reg = <0x0 0x1000>;
+                               protect-exec;
+                       };
+
+                       pm_sram_data: pm-sram-data@1000 {
+                               compatible = "ti,sram";
+                               reg = <0x1000 0x1000>;
+                               pool;
+                       };
                };
 
                dcan0: can@481cc000 {