[PATCH] ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.

[PATCH] ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.

[R Sricharan]

The system dma module has capabiities register indicating
the support for descriptor loading, constant fill, etc.
Use this instead of OMAP revision check to identify the features
supported runtime.

This avoids patching the code for feature SOCs which has
those capabilities.

Signed-off-by: R Sricharan <r.sricharan@ti.com>
---
 arch/arm/mach-omap2/dma.c             |   11 +++++++----
 arch/arm/plat-omap/include/plat/dma.h |    5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
index b19d849..ff75abe 100644
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -227,10 +227,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
 
 	dma_stride		= OMAP2_DMA_STRIDE;
 	dma_common_ch_start	= CSDP;
-	if (cpu_is_omap3630() || cpu_is_omap44xx())
-		dma_common_ch_end = CCDN;
-	else
-		dma_common_ch_end = CCFN;
 
 	p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);
 	if (!p) {
@@ -277,6 +273,13 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
 		dev_err(&pdev->dev, "%s: kzalloc fail\n", __func__);
 		return -ENOMEM;
 	}
+
+	/* Check the capabilities register for descriptor loading feature */
+	if (dma_read(CAPS_0, 0) & DMA_HAS_DESCRIPTOR_CAPS)
+		dma_common_ch_end = CCDN;
+	else
+		dma_common_ch_end = CCFN;
+
 	return 0;
 }
 
diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h
index dc562a5..7742204 100644
--- a/arch/arm/plat-omap/include/plat/dma.h
+++ b/arch/arm/plat-omap/include/plat/dma.h
@@ -312,6 +312,11 @@
 #define CLEAR_CSR_ON_READ		BIT(0xC)
 #define IS_WORD_16			BIT(0xD)
 
+/* Defines for DMA Capabilities */
+#define DMA_HAS_TRANSPARENT_CAPS	(0x1 << 18)
+#define DMA_HAS_CONSTANT_FILL_CAPS	(0x1 << 19)
+#define DMA_HAS_DESCRIPTOR_CAPS		(0x3 << 20)
+
 enum omap_reg_offsets {
 
 GCR,		GSCR,		GRST1,		HW_ID,
-- 
1.7.1

Re: [PATCH] ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.

[Shilimkar, Santosh]

On Fri, May 4, 2012 at 12:59 PM, R Sricharan <r.sricharan@ti.com> wrote:
> The system dma module has capabiities register indicating
> the support for descriptor loading, constant fill, etc.
> Use this instead of OMAP revision check to identify the features
> supported runtime.
>
> This avoids patching the code for feature SOCs which has
> those capabilities.
>
> Signed-off-by: R Sricharan <r.sricharan@ti.com>
> ---
>  arch/arm/mach-omap2/dma.c             |   11 +++++++----
>  arch/arm/plat-omap/include/plat/dma.h |    5 +++++
>  2 files changed, 12 insertions(+), 4 deletions(-)
>
Looks fine. Will add it to my clean-up series if no has
any objection on the patch.

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] ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.

[Tony Lindgren]

* Shilimkar, Santosh <santosh.shilimkar@ti.com> [120504 00:37]:
> On Fri, May 4, 2012 at 12:59 PM, R Sricharan <r.sricharan@ti.com> wrote:
> > The system dma module has capabiities register indicating
> > the support for descriptor loading, constant fill, etc.
> > Use this instead of OMAP revision check to identify the features
> > supported runtime.
> >
> > This avoids patching the code for feature SOCs which has
> > those capabilities.
> >
> > Signed-off-by: R Sricharan <r.sricharan@ti.com>
> > ---
> >  arch/arm/mach-omap2/dma.c             |   11 +++++++----
> >  arch/arm/plat-omap/include/plat/dma.h |    5 +++++
> >  2 files changed, 12 insertions(+), 4 deletions(-)
> >
> Looks fine. Will add it to my clean-up series if no has
> any objection on the patch.

Yes this is nice.

Tony
--
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