ARM: OMAP2xxx: hwmod: Add DMA support for SHAM module

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>
[paul@pwsan.com: fixed lines causing sparse warnings]
Signed-off-by: Paul Walmsley <paul@pwsan.com>

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 d1c14e4878411e0b38d0a2419cefe321426a2262..339ac273c60d96b9237a9391587337feb398530e 100644 (file)
--- 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 5eab0963298d67474a5dff23c1caa7e015be8f10..f3bdb324f6fdff6974018fd620321a4c6a3cc178 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -886,9 +886,15 @@ static struct omap_hwmod_irq_info omap2_sham_mpu_irqs[] = {
        { .irq = -1 }
 };
 
+static struct omap_hwmod_dma_info omap2_sham_sdma_chs[] = {
+       { .name = "rx", .dma_req = 13 },
+       { .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 = {