diff mbox

[2/7] ARM: OMAP2xxx: hwmod: Add DMA information for SHAM module

Message ID 1350683640-15044-3-git-send-email-mgreer@animalcreek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mark Greer Oct. 19, 2012, 9:53 p.m. UTC 
From: "Mark A. Greer" <mgreer@animalcreek.com>

Add the DMA information for the OMAP2 SHA module.

CC: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
---
 arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 2 +-
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Paul Walmsley Oct. 20, 2012, 7:40 p.m. UTC | #1 
On Fri, 19 Oct 2012, Mark A. Greer wrote:

> From: "Mark A. Greer" <mgreer@animalcreek.com>
> 
> Add the DMA information for the OMAP2 SHA module.
> 
> CC: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>

This can probably be combined with the first patch.


- Paul
Mark Greer Oct. 22, 2012, 7:37 p.m. UTC | #2 
On Sat, Oct 20, 2012 at 07:40:44PM +0000, Paul Walmsley wrote:
> On Fri, 19 Oct 2012, Mark A. Greer wrote:
> 
> > From: "Mark A. Greer" <mgreer@animalcreek.com>
> > 
> > Add the DMA information for the OMAP2 SHA module.
> > 
> > CC: Paul Walmsley <paul@pwsan.com>
> > Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
> 
> This can probably be combined with the first patch.

I made it a separate patch because the original omap2xxx code didn't
support DMA and I wanted to keep the first patch an apples-apples
conversion and _add_ functionality in this, separate, patch.

I prefer 2 patches but if you still want me to combine them, let me know.

Mark
--
Paul Walmsley Oct. 22, 2012, 7:53 p.m. UTC | #3 
On Mon, 22 Oct 2012, Mark A. Greer wrote:

> On Sat, Oct 20, 2012 at 07:40:44PM +0000, Paul Walmsley wrote:
> > On Fri, 19 Oct 2012, Mark A. Greer wrote:
> > 
> > > From: "Mark A. Greer" <mgreer@animalcreek.com>
> > > 
> > > Add the DMA information for the OMAP2 SHA module.
> > > 
> > > CC: Paul Walmsley <paul@pwsan.com>
> > > Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
> > 
> > This can probably be combined with the first patch.
> 
> I made it a separate patch because the original omap2xxx code didn't
> support DMA and I wanted to keep the first patch an apples-apples
> conversion and _add_ functionality in this, separate, patch.
> 
> I prefer 2 patches but if you still want me to combine them, let me know.

OK, I see.  That's fine, then.  Maybe add a sentence about that into the 
patch description of #2, that this effectively enables a code path in 
the driver that wasn't being used before, and therefore should be in a 
separate patch for ease of bisecting?


- Paul
Mark Greer Oct. 22, 2012, 8:01 p.m. UTC | #4 
On Mon, Oct 22, 2012 at 07:53:06PM +0000, Paul Walmsley wrote:
> On Mon, 22 Oct 2012, Mark A. Greer wrote:
> 
> > On Sat, Oct 20, 2012 at 07:40:44PM +0000, Paul Walmsley wrote:
> > > On Fri, 19 Oct 2012, Mark A. Greer wrote:
> > > 
> > > > From: "Mark A. Greer" <mgreer@animalcreek.com>
> > > > 
> > > > Add the DMA information for the OMAP2 SHA module.
> > > > 
> > > > CC: Paul Walmsley <paul@pwsan.com>
> > > > Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
> > > 
> > > This can probably be combined with the first patch.
> > 
> > I made it a separate patch because the original omap2xxx code didn't
> > support DMA and I wanted to keep the first patch an apples-apples
> > conversion and _add_ functionality in this, separate, patch.
> > 
> > I prefer 2 patches but if you still want me to combine them, let me know.
> 
> OK, I see.  That's fine, then.  Maybe add a sentence about that into the 
> patch description of #2, that this effectively enables a code path in 
> the driver that wasn't being used before, and therefore should be in a 
> separate patch for ease of bisecting?

Sure.  After your comment I realized my description was insufficient.

Mark
--
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
index bb314c5..4b4fd5f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
@@ -405,5 +405,5 @@  struct omap_hwmod_ocp_if omap2xxx_l4_core__sham = {
 	.slave		= &omap2xxx_sham_hwmod,
 	.clk		= "sha_ick",
 	.addr		= omap2xxx_sham_addrs,
-	.user		= OCP_USER_MPU,
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index a041670..703b269 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -873,9 +873,15 @@  struct omap_hwmod_irq_info omap2_sham_mpu_irqs[] = {
 	{ .irq = -1 }
 };
 
+struct omap_hwmod_dma_info omap2_sham_sdma_chs[] = {
+	{ .name = "rx", .dma_req = OMAP24XX_DMA_SHA1MD5_RX },
+	{ .dma_req = -1 }
+};
+
 struct omap_hwmod omap2xxx_sham_hwmod = {
 	.name		= "sham",
 	.mpu_irqs	= omap2_sham_mpu_irqs,
+	.sdma_reqs	= omap2_sham_sdma_chs,
 	.main_clk	= "l4_ck",
 	.prcm		= {
 		.omap2 = {