4 files changed, 43 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/arm/omap/dmm.txt b/Documentation/devicetree/bindings/arm/omap/dmm.txt
new file mode 100644
index 000000000000..8bd6d0a238a8
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/omap/dmm.txt
@@ -0,0 +1,22 @@
+OMAP Dynamic Memory Manager (DMM) bindings
+
+The dynamic memory manager (DMM) is a module located immediately in front of the
+SDRAM controllers (called EMIFs on OMAP). DMM manages various aspects of memory
+accesses such as priority generation amongst initiators, configuration of SDRAM
+interleaving, optimizing transfer of 2D block objects, and provide MMU-like page
+translation for initiators which need contiguous dma bus addresses.
+
+Required properties:
+- compatible:   Should contain "ti,omap4-dmm" for OMAP4 family
+                Should contain "ti,omap5-dmm" for OMAP5 and DRA7x family
+- reg:          Contains DMM register address range (base address and length)
+- interrupts:   Should contain an interrupt-specifier for DMM_IRQ.
+- ti,hwmods:    Name of the hwmod associated to DMM, which is typically "dmm"
+
+Example:
+
+dmm@4e000000 {
+        compatible = "ti,omap4-dmm";
+        reg = <0x4e000000 0x800>;
+        ti,hwmods = "dmm";
+};
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1fd75aa4639d..6e89630f8022 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -464,6 +464,13 @@
                         ti,hwmods = "wd_timer2";
                 };
 
+                dmm@4e000000 {
+                        compatible = "ti,omap5-dmm";
+                        reg = <0x4e000000 0x800>;
+                        interrupts = <0 113 0x4>;
+                        ti,hwmods = "dmm";
+                };
+
                 i2c1: i2c@48070000 {
                         compatible = "ti,omap4-i2c";
                         reg = <0x48070000 0x100>;
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index d3f8a6e8ca20..1b4f59bed0f5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -554,6 +554,13 @@
                         ti,hwmods = "kbd";
                 };
 
+                dmm@4e000000 {
+                        compatible = "ti,omap4-dmm";
+                        reg = <0x4e000000 0x800>;
+                        interrupts = <0 113 0x4>;
+                        ti,hwmods = "dmm";
+                };
+
                 emif1: emif@4c000000 {
                         compatible = "ti,emif-4d";
                         reg = <0x4c000000 0x100>;
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index a72813a9663e..4c3e9f125475 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -683,6 +683,13 @@
                         ti,hwmods = "wd_timer2";
                 };
 
+                dmm@4e000000 {
+                        compatible = "ti,omap5-dmm";
+                        reg = <0x4e000000 0x800>;
+                        interrupts = <0 113 0x4>;
+                        ti,hwmods = "dmm";
+                };
+
                 emif1: emif@4c000000 {
                         compatible      = "ti,emif-4d5";
                         ti,hwmods       = "emif1";