From: "Mark A. Greer" <mgreer@animalcreek.com>
To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au,
davem@davemloft.net, dmitry.kasatkin@intel.com,
rmk+kernel@arm.linux.org.uk, paul@pwsan.com,
khilman@deeprootsystems.com,
"Mark A. Greer" <mgreer@animalcreek.com>
Subject: [PATCH v3 2/7] ARM: OMAP2xxx: hwmod: Add DMA support for SHAM module
Date: Tue, 6 Nov 2012 19:57:08 -0700 [thread overview]
Message-ID: <1352257033-32495-3-git-send-email-mgreer@animalcreek.com> (raw)
In-Reply-To: <1352257033-32495-1-git-send-email-mgreer@animalcreek.com>
From: "Mark A. Greer" <mgreer@animalcreek.com>
The current OMAP2 SHAM support doesn't enable DMA
so add that support so it can use DMA just like OMAP3.
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(-)
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 = {
--
1.7.12
WARNING: multiple messages have this Message-ID (diff)
From: mgreer@animalcreek.com (Mark A. Greer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/7] ARM: OMAP2xxx: hwmod: Add DMA support for SHAM module
Date: Tue, 6 Nov 2012 19:57:08 -0700 [thread overview]
Message-ID: <1352257033-32495-3-git-send-email-mgreer@animalcreek.com> (raw)
In-Reply-To: <1352257033-32495-1-git-send-email-mgreer@animalcreek.com>
From: "Mark A. Greer" <mgreer@animalcreek.com>
The current OMAP2 SHAM support doesn't enable DMA
so add that support so it can use DMA just like OMAP3.
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(-)
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 = {
--
1.7.12
next prev parent reply other threads:[~2012-11-07 2:57 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 2:57 [PATCH v3 0/7] crypto: omap-sham updates Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-07 2:57 ` [PATCH v3 1/7] ARM: OMAP2xxx: hwmod: Convert SHAM crypto device data to hwmod Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-09 16:10 ` Kasatkin, Dmitry
2012-11-09 16:10 ` Kasatkin, Dmitry
2012-11-09 17:07 ` Mark A. Greer
2012-11-09 17:07 ` Mark A. Greer
2012-11-09 17:11 ` Paul Walmsley
2012-11-09 17:11 ` Paul Walmsley
2012-11-09 18:00 ` Tony Lindgren
2012-11-09 18:00 ` Tony Lindgren
2012-11-09 18:20 ` Mark A. Greer
2012-11-09 18:20 ` Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer [this message]
2012-11-07 2:57 ` [PATCH v3 2/7] ARM: OMAP2xxx: hwmod: Add DMA support for SHAM module Mark A. Greer
2012-11-07 2:57 ` [PATCH v3 3/7] ARM: OMAP3xxx: hwmod: Convert SHAM crypto device data to hwmod Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-09 16:11 ` Kasatkin, Dmitry
2012-11-09 16:11 ` Kasatkin, Dmitry
2012-11-07 2:57 ` [PATCH v3 4/7] ARM: OMAP2+: Remove unnecessary message when no SHA IP is present Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-07 2:57 ` [PATCH v3 5/7] crypto: omap-sham: Convert to use pm_runtime API Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-14 1:12 ` Kevin Hilman
2012-11-14 1:12 ` Kevin Hilman
2012-11-07 2:57 ` [PATCH v3 6/7] crypto: omap-sham: Add code to use dmaengine API Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-07 2:57 ` [PATCH v3 7/7] crypto: omap_sham: Remove usage of private DMA API Mark A. Greer
2012-11-07 2:57 ` Mark A. Greer
2012-11-09 16:28 ` Kasatkin, Dmitry
2012-11-09 16:28 ` Kasatkin, Dmitry
2012-11-09 17:17 ` Mark A. Greer
2012-11-09 17:17 ` Mark A. Greer
2012-11-14 7:47 ` Kasatkin, Dmitry
2012-11-14 7:47 ` Kasatkin, Dmitry
2012-11-14 16:47 ` Mark A. Greer
2012-11-14 16:47 ` Mark A. Greer
2012-11-16 22:40 ` Mark A. Greer
2012-11-16 22:40 ` Mark A. Greer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352257033-32495-3-git-send-email-mgreer@animalcreek.com \
--to=mgreer@animalcreek.com \
--cc=davem@davemloft.net \
--cc=dmitry.kasatkin@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=khilman@deeprootsystems.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=rmk+kernel@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.