Currently on da830/omapl137 EDMA fails to get initialized because
EDMA channel controller name is being passed wrongly. This is
preventing a kernel crash which could happen as the queue_tc_mapping
and queue_priority_mapping are not initialized for da830/omapl137.

Signed-off-by: Sudhakar Rajashekhara <sudhakar....@ti.com>
---
 arch/arm/mach-davinci/devices-da830.c |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-davinci/devices-da830.c 
b/arch/arm/mach-davinci/devices-da830.c
index 95110ca..15cdff9 100644
--- a/arch/arm/mach-davinci/devices-da830.c
+++ b/arch/arm/mach-davinci/devices-da830.c
@@ -85,17 +85,34 @@ static const s8 da830_dma_chan_no_event[] = {
        -1
 };
 
+static const s8 da830_queue_tc_mapping[][2] = {
+       /* {event queue no, TC no} */
+       {0, 0},
+       {1, 1},
+       {-1, -1}
+};
+
+static const s8 da830_queue_priority_mapping[][2] = {
+       /* {event queue no, Priority} */
+       {0, 3},
+       {1, 7},
+       {-1, -1}
+};
+
 static struct edma_soc_info da830_edma_info = {
-       .n_channel      = 32,
-       .n_region       = 4,
-       .n_slot         = 128,
-       .n_tc           = 2,
-       .noevent        = da830_dma_chan_no_event,
+       .n_channel              = 32,
+       .n_region               = 4,
+       .n_slot                 = 128,
+       .n_tc                   = 2,
+       .n_cc                   = 1,
+       .noevent                = da830_dma_chan_no_event,
+       .queue_tc_mapping       = da830_queue_tc_mapping,
+       .queue_priority_mapping = da830_queue_priority_mapping,
 };
 
 static struct resource da830_edma_resources[] = {
        {
-               .name   = "edma_cc",
+               .name   = "edma_cc0",
                .start  = DA830_TPCC_BASE,
                .end    = DA830_TPCC_BASE + SZ_32K - 1,
                .flags  = IORESOURCE_MEM,
-- 
1.5.6

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to