The OMAP4 hwmod data base is updated with DMA controller attributes.
Also, irq name are changed from 0 to dma_0, 1->dma_1 ... in order provide
meaningful name to irq names.
Signed-off-by: Manjunatha GK <manjugk@xxxxxx>
Signed-off-by: Basak, Partha <p-basak2@xxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 20f5f8c..46d83f5 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -22,6 +22,9 @@
#include <plat/omap_hwmod.h>
#include <plat/cpu.h>
+#include <plat/dma.h>
+
+#include <mach/dma.h>
#include "omap_hwmod_common_data.h"
@@ -750,12 +753,19 @@ static struct omap_hwmod_class omap44xx_dma_hwmod_class = {
.sysc = &omap44xx_dma_sysc,
};
+/* dma attributes */
+static struct omap_dma_dev_attr dma_dev_attr = {
+ .dma_dev_attr = DMA_LINKED_LCH | GLOBAL_PRIORITY |
+ IS_CSSA_32 | IS_CDSA_32,
+ .dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT,
+};
+
/* dma_system */
static struct omap_hwmod_irq_info omap44xx_dma_system_irqs[] = {
- { .name = "0", .irq = 12 + OMAP44XX_IRQ_GIC_START },
- { .name = "1", .irq = 13 + OMAP44XX_IRQ_GIC_START },
- { .name = "2", .irq = 14 + OMAP44XX_IRQ_GIC_START },
- { .name = "3", .irq = 15 + OMAP44XX_IRQ_GIC_START },
+ { .name = "dma_0", .irq = 12 + OMAP44XX_IRQ_GIC_START },
+ { .name = "dma_1", .irq = 13 + OMAP44XX_IRQ_GIC_START },
+ { .name = "dma_2", .irq = 14 + OMAP44XX_IRQ_GIC_START },
+ { .name = "dma_3", .irq = 15 + OMAP44XX_IRQ_GIC_START },
};
static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = {
@@ -801,6 +811,7 @@ static struct omap_hwmod omap44xx_dma_system_hwmod = {
.slaves_cnt = ARRAY_SIZE(omap44xx_dma_system_slaves),
.masters = omap44xx_dma_system_masters,
.masters_cnt = ARRAY_SIZE(omap44xx_dma_system_masters),
+ .dev_attr = &dma_dev_attr,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
};
@@ -4789,7 +4800,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
/* counter class */
&omap44xx_counter_32k_hwmod,
/* dma class */
-/* &omap44xx_dma_system_hwmod, */
+ &omap44xx_dma_system_hwmod,
/* dmic class */
/* &omap44xx_dmic_hwmod, */
/* dsp class */
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
