Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-davinci / devices-da8xx.c

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 56ea41d5f8491307ab89b3178365071cec34ee3d..b85b781b05fdf7d89d7a3c256727ea9024b6d0d8 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -134,13 +134,6 @@ struct platform_device da8xx_serial_device[] = {
        }
 };
 
-static s8 da8xx_queue_tc_mapping[][2] = {
-       /* {event queue no, TC no} */
-       {0, 0},
-       {1, 1},
-       {-1, -1}
-};
-
 static s8 da8xx_queue_priority_mapping[][2] = {
        /* {event queue no, Priority} */
        {0, 3},
@@ -148,12 +141,6 @@ static s8 da8xx_queue_priority_mapping[][2] = {
        {-1, -1}
 };
 
-static s8 da850_queue_tc_mapping[][2] = {
-       /* {event queue no, TC no} */
-       {0, 0},
-       {-1, -1}
-};
-
 static s8 da850_queue_priority_mapping[][2] = {
        /* {event queue no, Priority} */
        {0, 3},
@@ -161,12 +148,6 @@ static s8 da850_queue_priority_mapping[][2] = {
 };
 
 static struct edma_soc_info da830_edma_cc0_info = {
-       .n_channel              = 32,
-       .n_region               = 4,
-       .n_slot                 = 128,
-       .n_tc                   = 2,
-       .n_cc                   = 1,
-       .queue_tc_mapping       = da8xx_queue_tc_mapping,
        .queue_priority_mapping = da8xx_queue_priority_mapping,
        .default_queue          = EVENTQ_1,
 };
@@ -177,22 +158,10 @@ static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = {
 
 static struct edma_soc_info da850_edma_cc_info[] = {
        {
-               .n_channel              = 32,
-               .n_region               = 4,
-               .n_slot                 = 128,
-               .n_tc                   = 2,
-               .n_cc                   = 1,
-               .queue_tc_mapping       = da8xx_queue_tc_mapping,
                .queue_priority_mapping = da8xx_queue_priority_mapping,
                .default_queue          = EVENTQ_1,
        },
        {
-               .n_channel              = 32,
-               .n_region               = 4,
-               .n_slot                 = 128,
-               .n_tc                   = 1,
-               .n_cc                   = 1,
-               .queue_tc_mapping       = da850_queue_tc_mapping,
                .queue_priority_mapping = da850_queue_priority_mapping,
                .default_queue          = EVENTQ_0,
        },