[PATCH v2 0/2] ARM: dts: OMAP4+: Add dmm device bindings

[PATCH v2 0/2] ARM: dts: OMAP4+: Add dmm device bindings

[Andy Gross]

This patch set adds devicetree bindings for the Dynamic Memory Manager (DMM)
inside the OMAP4 and OMAP5 devices, creates the platform_device using the DT
entry if present or falls back to using the hwmod entry if not, and adds
documentation for the minimal binding.

v2: Handle both DT and non DT device creation

Andy Gross (2):
  ARM: dts: OMAP4+: Add DMM bindings
  ARM: OMAP2+: Enable DT usage during dmm create

 Documentation/devicetree/bindings/arm/omap/dmm.txt |   16 ++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |    7 +++++++
 arch/arm/boot/dts/omap5.dtsi                       |    7 +++++++
 arch/arm/mach-omap2/drm.c                          |   17 +++++++++++------
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/dmm.txt

-- 
1.7.5.4

[PATCH v2 1/2] ARM: dts: OMAP4+: Add DMM bindings

[Andy Gross]

Add Dynamic Memory Manager (DMM) bindings for OMAP4 and OMAP5 devices.
Add documentation for the DMM bindings.

Signed-off-by: Andy Gross <andy.gross@ti.com>
---
 Documentation/devicetree/bindings/arm/omap/dmm.txt |   16 ++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |    7 +++++++
 arch/arm/boot/dts/omap5.dtsi                       |    7 +++++++
 3 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/dmm.txt

diff --git a/Documentation/devicetree/bindings/arm/omap/dmm.txt b/Documentation/devicetree/bindings/arm/omap/dmm.txt
new file mode 100644
index 0000000..5fd1134
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/omap/dmm.txt
@@ -0,0 +1,16 @@
+OMAP Dynamic Memory Manager (DMM) bindings
+
+Required properties:
+- compatible:	Must be "ti,dmm" for OMAP processors containing DMM block
+- reg:		Contains timer register address range (base address and length)
+- interrupts:	Contains interrupt information (source, etc) for the DMM IRQ
+- ti,hwmods:	Name of the hwmod associated to the counter, which is typically
+		"dmm"
+
+Example:
+
+dmm: dmm@4e000000 {
+	compatible = "ti,dmm";
+	reg = <0x4e000000 0x800>;
+	ti,hwmods = "dmm";
+};
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 2a56428..53951e9 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -660,5 +660,12 @@
 			ram-bits = <12>;
 			ti,has-mailbox;
 		};
+
+		dmm: dmm@4e000000 {
+			compatible = "ti,dmm";
+			reg = <0x4e000000 0x800>;
+			interrupts = <0 113 0x4>;
+			ti,hwmods = "dmm";
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 3dd7ff8..e77af8d 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -667,5 +667,12 @@
 				ctrl-module = <&omap_control_usb>;
 			};
 		};
+
+		dmm: dmm@4e000000 {
+			compatible = "ti,dmm";
+			reg = <0x4e000000 0x800>;
+			interrupts = <0 113 0x4>;
+			ti,hwmods = "dmm";
+		};
 	};
 };
-- 
1.7.5.4

[PATCH v2 2/2] ARM: OMAP2+: Enable DT usage during dmm create

[Andy Gross]

If DMM device tree information is present, use it for creating the
device.  Otherwise fall back to using the hwmod entry.

Signed-off-by: Andy Gross <andy.gross@ti.com>
---
 arch/arm/mach-omap2/drm.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index 59a4af7..e1e20ec 100644
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_data/omap_drm.h>
+#include <linux/of.h>
 
 #include "soc.h"
 #include "omap_device.h"
@@ -47,13 +48,17 @@ static int __init omap_init_drm(void)
 	struct omap_hwmod *oh = NULL;
 	struct platform_device *pdev;
 
-	/* lookup and populate the DMM information, if present - OMAP4+ */
-	oh = omap_hwmod_lookup("dmm");
+	if (!of_find_compatible_node(NULL, NULL, "ti,dmm")) {
 
-	if (oh) {
-		pdev = omap_device_build(oh->name, -1, oh, NULL, 0);
-		WARN(IS_ERR(pdev), "Could not build omap_device for %s\n",
-			oh->name);
+		/* resort to hwmod lookup - LEGACY */
+		/* lookup and populate the DMM information, OMAP4+ only */
+		oh = omap_hwmod_lookup("dmm");
+
+		if (oh) {
+			pdev = omap_device_build(oh->name, -1, oh, NULL, 0);
+			WARN(IS_ERR(pdev), "Could not build device for %s\n",
+				oh->name);
+		}
 	}
 
 	platform_data.omaprev = GET_OMAP_TYPE;
-- 
1.7.5.4

[PATCH v2 0/2] ARM: dts: OMAP4+: Add dmm device bindings

[Andy Gross]

This patch set adds devicetree bindings for the Dynamic Memory Manager (DMM)
inside the OMAP4 and OMAP5 devices, removes generation of the device node via
the hwmod, and adds documentation for the minimal binding.

This patch series is based on device tree patches queued up for OMAP 3.10.

Patches are located at:
https://github.com/andygross/omap_dmm_tiler/commits/for-benoit

Changes in v2:
	- Moved documentation file to bindings patch.
 	- Modified drm code to allow for cases where DT info is unavailable.

Andy Gross (2):
  ARM: dts: OMAP4+: Add DMM bindings
  ARM: OMAP2+: Don't create DMM if DT present

 Documentation/devicetree/bindings/arm/omap/dmm.txt |   16 ++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |    7 +++++++
 arch/arm/boot/dts/omap5.dtsi                       |    7 +++++++
 arch/arm/mach-omap2/drm.c                          |   18 ++++++++++++------
 4 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/dmm.txt

-- 
1.7.5.4