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

[PATCH 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

Andy Gross (2):
  ARM: dts: OMAP4+: Add DMM bindings
  ARM: OMAP2+: Remove dmm device creation

 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                          |   12 ------------
 4 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/dmm.txt

-- 
1.7.5.4

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

[Andy Gross]

Add DMM bindings for OMAP4 and OMAP5 devices.

Signed-off-by: Andy Gross <andy.gross@ti.com>
---
 arch/arm/boot/dts/omap4.dtsi |    7 +++++++
 arch/arm/boot/dts/omap5.dtsi |    7 +++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index ddfc54a..749fe83 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -624,5 +624,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 b760c11..c2d2ecc 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -650,5 +650,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 2/2] ARM: OMAP2+: Remove dmm device creation

[Andy Gross]

Remove DMM device creation via the hwmod entry.  The DMM device will
now be enumerated as part of the device tree information for the
processor.

Signed-off-by: Andy Gross <andy.gross@ti.com>
---
 Documentation/devicetree/bindings/arm/omap/dmm.txt |   16 ++++++++++++++++
 arch/arm/mach-omap2/drm.c                          |   12 ------------
 2 files changed, 16 insertions(+), 12 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/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index 59a4af7..1fd0487 100644
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -44,18 +44,6 @@ static struct platform_device omap_drm_device = {
 
 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 (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);
-	}
-
 	platform_data.omaprev = GET_OMAP_TYPE;
 
 	return platform_device_register(&omap_drm_device);
-- 
1.7.5.4

Re: [PATCH 2/2] ARM: OMAP2+: Remove dmm device creation

[Santosh Shilimkar]

On Wednesday 20 March 2013 10:13 AM, Andy Gross wrote:
> Remove DMM device creation via the hwmod entry.  The DMM device will
> now be enumerated as part of the device tree information for the
> processor.
> 
> Signed-off-by: Andy Gross <andy.gross@ti.com>
> ---
OMAP4 is still not made DT only so I suggest you to hold on for this patch
till that happens.

Regards,
Santosh

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

[Santosh Shilimkar]

On Wednesday 20 March 2013 10:13 AM, Andy Gross wrote:
> Add DMM bindings for OMAP4 and OMAP5 devices.
> 
> Signed-off-by: Andy Gross <andy.gross@ti.com>
> ---
>  arch/arm/boot/dts/omap4.dtsi |    7 +++++++
>  arch/arm/boot/dts/omap5.dtsi |    7 +++++++
>  2 files changed, 14 insertions(+), 0 deletions(-)
> 
"Documentation/devicetree/bindings/arm/omap/dmm.txt |   16 ++++++++++++++++

You should add the bidning information along or before
adding the DT node. I see you have that in next patch.
You should move that as part of this patch to be
consistent. Otherwise patch looks fine to me.

Regards,
Santosh

Re: [PATCH 2/2] ARM: OMAP2+: Remove dmm device creation

[Archit Taneja]

On Wednesday 20 March 2013 11:26 AM, Santosh Shilimkar wrote:
> On Wednesday 20 March 2013 10:13 AM, Andy Gross wrote:
>> Remove DMM device creation via the hwmod entry.  The DMM device will
>> now be enumerated as part of the device tree information for the
>> processor.
>>
>> Signed-off-by: Andy Gross <andy.gross@ti.com>
>> ---
> OMAP4 is still not made DT only so I suggest you to hold on for this patch
> till that happens.

Wouldn't we need to at least prevent building the platform device using 
omap_device_build() when we are using DT?

Archit

>
> Regards,
> Santosh
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>

Re: [PATCH 2/2] ARM: OMAP2+: Remove dmm device creation

[Santosh Shilimkar]

On Wednesday 20 March 2013 11:46 AM, Archit Taneja wrote:
> On Wednesday 20 March 2013 11:26 AM, Santosh Shilimkar wrote:
>> On Wednesday 20 March 2013 10:13 AM, Andy Gross wrote:
>>> Remove DMM device creation via the hwmod entry.  The DMM device will
>>> now be enumerated as part of the device tree information for the
>>> processor.
>>>
>>> Signed-off-by: Andy Gross <andy.gross@ti.com>
>>> ---
>> OMAP4 is still not made DT only so I suggest you to hold on for this patch
>> till that happens.
> 
> Wouldn't we need to at least prevent building the platform device using omap_device_build() when we are using DT?
> 
Yes. I assumed Andy will do that once he decides to keep the
non-dt support :)

Regards,
Santosh

RE: [PATCH 2/2] ARM: OMAP2+: Remove dmm device creation

[Gross, Andy]

Yes ill fix it up and move the doc to the other patch and send a v2


________________________________________
From: Shilimkar, Santosh
Sent: Wednesday, March 20, 2013 1:22 AM
To: Taneja, Archit
Cc: Gross, Andy; linux-omap@vger.kernel.org; Cousson, Benoit; devicetree-discuss@lists.ozlabs.org; Menon, Nishanth
Subject: Re: [PATCH 2/2] ARM: OMAP2+: Remove dmm device creation

On Wednesday 20 March 2013 11:46 AM, Archit Taneja wrote:
> On Wednesday 20 March 2013 11:26 AM, Santosh Shilimkar wrote:
>> On Wednesday 20 March 2013 10:13 AM, Andy Gross wrote:
>>> Remove DMM device creation via the hwmod entry.  The DMM device will
>>> now be enumerated as part of the device tree information for the
>>> processor.
>>>
>>> Signed-off-by: Andy Gross <andy.gross@ti.com>
>>> ---
>> OMAP4 is still not made DT only so I suggest you to hold on for this patch
>> till that happens.
>
> Wouldn't we need to at least prevent building the platform device using omap_device_build() when we are using DT?
>
Yes. I assumed Andy will do that once he decides to keep the
non-dt support :)

Regards,
Santosh