Skip to content

L
linux
Commit d4cb7f40 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files
Options

ARM: davinci/common: Convert edma driver to handle one eDMA instance per driver 

Currently we have one device created to handle all (maximum 2) eDMAs in the
system.
With this change all eDMA instance will have it's own device/driver.
This change is needed for further cleanups in the eDMA driver stack since
the one device/driver to handle all eDMAs in the system was not flexible
enough and prevents the upcoming work.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 8fa7ff4f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 234 additions and 326 deletions
arch/arm/common/edma.c
View file @ d4cb7f40
This diff is collapsed.
arch/arm/mach-davinci/devices-da8xx.c
View file @ d4cb7f40
...@@ -147,150 +147,114 @@ static s8 da850_queue_priority_mapping[][2] = { ...@@ -147,150 +147,114 @@ static s8 da850_queue_priority_mapping[][2] = {
{-1, -1} {-1, -1}
}; };
static struct edma_soc_info da830_edma_cc0_info = { static struct edma_soc_info da8xx_edma0_pdata = {
.queue_priority_mapping = da8xx_queue_priority_mapping, .queue_priority_mapping = da8xx_queue_priority_mapping,
.default_queue = EVENTQ_1, .default_queue = EVENTQ_1,
}; };
static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = { static struct edma_soc_info da850_edma1_pdata = {
&da830_edma_cc0_info,
};
static struct edma_soc_info da850_edma_cc_info[] = {
{
.queue_priority_mapping = da8xx_queue_priority_mapping,
.default_queue = EVENTQ_1,
},
{
.queue_priority_mapping = da850_queue_priority_mapping, .queue_priority_mapping = da850_queue_priority_mapping,
.default_queue = EVENTQ_0, .default_queue = EVENTQ_0,
},
}; };
static struct edma_soc_info *da850_edma_info[EDMA_MAX_CC] = { static struct resource da8xx_edma0_resources[] = {
&da850_edma_cc_info[0],
&da850_edma_cc_info[1],
};
static struct resource da830_edma_resources[] = {
{ {
.name = "edma_cc0", .name = "edma3_cc",
.start = DA8XX_TPCC_BASE, .start = DA8XX_TPCC_BASE,
.end = DA8XX_TPCC_BASE + SZ_32K - 1, .end = DA8XX_TPCC_BASE + SZ_32K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc0", .name = "edma3_tc0",
.start = DA8XX_TPTC0_BASE, .start = DA8XX_TPTC0_BASE,
.end = DA8XX_TPTC0_BASE + SZ_1K - 1, .end = DA8XX_TPTC0_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc1", .name = "edma3_tc1",
.start = DA8XX_TPTC1_BASE, .start = DA8XX_TPTC1_BASE,
.end = DA8XX_TPTC1_BASE + SZ_1K - 1, .end = DA8XX_TPTC1_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma0", .name = "edma3_ccint",
.start = IRQ_DA8XX_CCINT0, .start = IRQ_DA8XX_CCINT0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "edma0_err", .name = "edma3_ccerrint",
.start = IRQ_DA8XX_CCERRINT, .start = IRQ_DA8XX_CCERRINT,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };
static struct resource da850_edma_resources[] = { static struct resource da850_edma1_resources[] = {
{ {
.name = "edma_cc0", .name = "edma3_cc",
.start = DA8XX_TPCC_BASE,
.end = DA8XX_TPCC_BASE + SZ_32K - 1,
.flags = IORESOURCE_MEM,
},
{
.name = "edma_tc0",
.start = DA8XX_TPTC0_BASE,
.end = DA8XX_TPTC0_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM,
},
{
.name = "edma_tc1",
.start = DA8XX_TPTC1_BASE,
.end = DA8XX_TPTC1_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM,
},
{
.name = "edma_cc1",
.start = DA850_TPCC1_BASE, .start = DA850_TPCC1_BASE,
.end = DA850_TPCC1_BASE + SZ_32K - 1, .end = DA850_TPCC1_BASE + SZ_32K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc2", .name = "edma3_tc0",
.start = DA850_TPTC2_BASE, .start = DA850_TPTC2_BASE,
.end = DA850_TPTC2_BASE + SZ_1K - 1, .end = DA850_TPTC2_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma0", .name = "edma3_ccint",
.start = IRQ_DA8XX_CCINT0,
.flags = IORESOURCE_IRQ,
},
{
.name = "edma0_err",
.start = IRQ_DA8XX_CCERRINT,
.flags = IORESOURCE_IRQ,
},
{
.name = "edma1",
.start = IRQ_DA850_CCINT1, .start = IRQ_DA850_CCINT1,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "edma1_err", .name = "edma3_ccerrint",
.start = IRQ_DA850_CCERRINT1, .start = IRQ_DA850_CCERRINT1,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };
static struct platform_device da830_edma_device = { static struct platform_device da8xx_edma0_device = {
.name = "edma", .name = "edma",
.id = -1, .id = 0,
.dev = { .dev = {
.platform_data = da830_edma_info, .platform_data = &da8xx_edma0_pdata,
}, },
.num_resources = ARRAY_SIZE(da830_edma_resources), .num_resources = ARRAY_SIZE(da8xx_edma0_resources),
.resource = da830_edma_resources, .resource = da8xx_edma0_resources,
}; };
static struct platform_device da850_edma_device = { static struct platform_device da850_edma1_device = {
.name = "edma", .name = "edma",
.id = -1, .id = 1,
.dev = { .dev = {
.platform_data = da850_edma_info, .platform_data = &da850_edma1_pdata,
}, },
.num_resources = ARRAY_SIZE(da850_edma_resources), .num_resources = ARRAY_SIZE(da850_edma1_resources),
.resource = da850_edma_resources, .resource = da850_edma1_resources,
}; };
int __init da830_register_edma(struct edma_rsv_info *rsv) int __init da830_register_edma(struct edma_rsv_info *rsv)
{ {
da830_edma_cc0_info.rsv = rsv; da8xx_edma0_pdata.rsv = rsv;
return platform_device_register(&da830_edma_device); return platform_device_register(&da8xx_edma0_device);
} }
int __init da850_register_edma(struct edma_rsv_info *rsv[2]) int __init da850_register_edma(struct edma_rsv_info *rsv[2])
{ {
int ret;
if (rsv) { if (rsv) {
da850_edma_cc_info[0].rsv = rsv[0]; da8xx_edma0_pdata.rsv = rsv[0];
da850_edma_cc_info[1].rsv = rsv[1]; da850_edma1_pdata.rsv = rsv[1];
} }
return platform_device_register(&da850_edma_device); ret = platform_device_register(&da8xx_edma0_device);
if (ret) {
pr_warn("%s: Failed to register eDMA0\n", __func__);
return ret;
}
return platform_device_register(&da850_edma1_device);
} }
static struct resource da8xx_i2c_resources0[] = { static struct resource da8xx_i2c_resources0[] = {
......
arch/arm/mach-davinci/dm355.c
View file @ d4cb7f40
...@@ -569,49 +569,44 @@ static u8 dm355_default_priorities[DAVINCI_N_AINTC_IRQ] = { ...@@ -569,49 +569,44 @@ static u8 dm355_default_priorities[DAVINCI_N_AINTC_IRQ] = {
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static s8 static s8 queue_priority_mapping[][2] = {
queue_priority_mapping[][2] = {
/* {event queue no, Priority} */ /* {event queue no, Priority} */
{0, 3}, {0, 3},
{1, 7}, {1, 7},
{-1, -1}, {-1, -1},
}; };
static struct edma_soc_info edma_cc0_info = { static struct edma_soc_info dm355_edma_pdata = {
.queue_priority_mapping = queue_priority_mapping, .queue_priority_mapping = queue_priority_mapping,
.default_queue = EVENTQ_1, .default_queue = EVENTQ_1,
}; };
static struct edma_soc_info *dm355_edma_info[EDMA_MAX_CC] = {
&edma_cc0_info,
};
static struct resource edma_resources[] = { static struct resource edma_resources[] = {
{ {
.name = "edma_cc0", .name = "edma3_cc",
.start = 0x01c00000, .start = 0x01c00000,
.end = 0x01c00000 + SZ_64K - 1, .end = 0x01c00000 + SZ_64K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc0", .name = "edma3_tc0",
.start = 0x01c10000, .start = 0x01c10000,
.end = 0x01c10000 + SZ_1K - 1, .end = 0x01c10000 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc1", .name = "edma3_tc1",
.start = 0x01c10400, .start = 0x01c10400,
.end = 0x01c10400 + SZ_1K - 1, .end = 0x01c10400 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma0", .name = "edma3_ccint",
.start = IRQ_CCINT0, .start = IRQ_CCINT0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "edma0_err", .name = "edma3_ccerrint",
.start = IRQ_CCERRINT, .start = IRQ_CCERRINT,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
...@@ -621,7 +616,7 @@ static struct resource edma_resources[] = { ...@@ -621,7 +616,7 @@ static struct resource edma_resources[] = {
static struct platform_device dm355_edma_device = { static struct platform_device dm355_edma_device = {
.name = "edma", .name = "edma",
.id = 0, .id = 0,
.dev.platform_data = dm355_edma_info, .dev.platform_data = &dm355_edma_pdata,
.num_resources = ARRAY_SIZE(edma_resources), .num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources, .resource = edma_resources,
}; };
......
arch/arm/mach-davinci/dm365.c
View file @ d4cb7f40
...@@ -853,8 +853,7 @@ static u8 dm365_default_priorities[DAVINCI_N_AINTC_IRQ] = { ...@@ -853,8 +853,7 @@ static u8 dm365_default_priorities[DAVINCI_N_AINTC_IRQ] = {
}; };
/* Four Transfer Controllers on DM365 */ /* Four Transfer Controllers on DM365 */
static s8 static s8 dm365_queue_priority_mapping[][2] = {
dm365_queue_priority_mapping[][2] = {
/* {event queue no, Priority} */ /* {event queue no, Priority} */
{0, 7}, {0, 7},
{1, 7}, {1, 7},
...@@ -863,53 +862,49 @@ dm365_queue_priority_mapping[][2] = { ...@@ -863,53 +862,49 @@ dm365_queue_priority_mapping[][2] = {
{-1, -1}, {-1, -1},
}; };
static struct edma_soc_info edma_cc0_info = { static struct edma_soc_info dm365_edma_pdata = {
.queue_priority_mapping = dm365_queue_priority_mapping, .queue_priority_mapping = dm365_queue_priority_mapping,
.default_queue = EVENTQ_3, .default_queue = EVENTQ_3,
}; };
static struct edma_soc_info *dm365_edma_info[EDMA_MAX_CC] = {
&edma_cc0_info,
};
static struct resource edma_resources[] = { static struct resource edma_resources[] = {
{ {
.name = "edma_cc0", .name = "edma3_cc",
.start = 0x01c00000, .start = 0x01c00000,
.end = 0x01c00000 + SZ_64K - 1, .end = 0x01c00000 + SZ_64K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc0", .name = "edma3_tc0",
.start = 0x01c10000, .start = 0x01c10000,
.end = 0x01c10000 + SZ_1K - 1, .end = 0x01c10000 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc1", .name = "edma3_tc1",
.start = 0x01c10400, .start = 0x01c10400,
.end = 0x01c10400 + SZ_1K - 1, .end = 0x01c10400 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc2", .name = "edma3_tc2",
.start = 0x01c10800, .start = 0x01c10800,
.end = 0x01c10800 + SZ_1K - 1, .end = 0x01c10800 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc3", .name = "edma3_tc3",
.start = 0x01c10c00, .start = 0x01c10c00,
.end = 0x01c10c00 + SZ_1K - 1, .end = 0x01c10c00 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma0", .name = "edma3_ccint",
.start = IRQ_CCINT0, .start = IRQ_CCINT0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "edma0_err", .name = "edma3_ccerrint",
.start = IRQ_CCERRINT, .start = IRQ_CCERRINT,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
...@@ -919,7 +914,7 @@ static struct resource edma_resources[] = { ...@@ -919,7 +914,7 @@ static struct resource edma_resources[] = {
static struct platform_device dm365_edma_device = { static struct platform_device dm365_edma_device = {
.name = "edma", .name = "edma",
.id = 0, .id = 0,
.dev.platform_data = dm365_edma_info, .dev.platform_data = &dm365_edma_pdata,
.num_resources = ARRAY_SIZE(edma_resources), .num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources, .resource = edma_resources,
}; };
......
arch/arm/mach-davinci/dm644x.c
View file @ d4cb7f40
...@@ -498,49 +498,44 @@ static u8 dm644x_default_priorities[DAVINCI_N_AINTC_IRQ] = { ...@@ -498,49 +498,44 @@ static u8 dm644x_default_priorities[DAVINCI_N_AINTC_IRQ] = {
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static s8 static s8 queue_priority_mapping[][2] = {
queue_priority_mapping[][2] = {
/* {event queue no, Priority} */ /* {event queue no, Priority} */
{0, 3}, {0, 3},
{1, 7}, {1, 7},
{-1, -1}, {-1, -1},
}; };
static struct edma_soc_info edma_cc0_info = { static struct edma_soc_info dm644x_edma_pdata = {
.queue_priority_mapping = queue_priority_mapping, .queue_priority_mapping = queue_priority_mapping,
.default_queue = EVENTQ_1, .default_queue = EVENTQ_1,
}; };
static struct edma_soc_info *dm644x_edma_info[EDMA_MAX_CC] = {
&edma_cc0_info,
};
static struct resource edma_resources[] = { static struct resource edma_resources[] = {
{ {
.name = "edma_cc0", .name = "edma3_cc",
.start = 0x01c00000, .start = 0x01c00000,
.end = 0x01c00000 + SZ_64K - 1, .end = 0x01c00000 + SZ_64K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc0", .name = "edma3_tc0",
.start = 0x01c10000, .start = 0x01c10000,
.end = 0x01c10000 + SZ_1K - 1, .end = 0x01c10000 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc1", .name = "edma3_tc1",
.start = 0x01c10400, .start = 0x01c10400,
.end = 0x01c10400 + SZ_1K - 1, .end = 0x01c10400 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma0", .name = "edma3_ccint",
.start = IRQ_CCINT0, .start = IRQ_CCINT0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "edma0_err", .name = "edma3_ccerrint",
.start = IRQ_CCERRINT, .start = IRQ_CCERRINT,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
...@@ -550,7 +545,7 @@ static struct resource edma_resources[] = { ...@@ -550,7 +545,7 @@ static struct resource edma_resources[] = {
static struct platform_device dm644x_edma_device = { static struct platform_device dm644x_edma_device = {
.name = "edma", .name = "edma",
.id = 0, .id = 0,
.dev.platform_data = dm644x_edma_info, .dev.platform_data = &dm644x_edma_pdata,
.num_resources = ARRAY_SIZE(edma_resources), .num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources, .resource = edma_resources,
}; };
......
arch/arm/mach-davinci/dm646x.c
View file @ d4cb7f40
...@@ -531,8 +531,7 @@ static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = { ...@@ -531,8 +531,7 @@ static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = {
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* Four Transfer Controllers on DM646x */ /* Four Transfer Controllers on DM646x */
static s8 static s8 dm646x_queue_priority_mapping[][2] = {
dm646x_queue_priority_mapping[][2] = {
/* {event queue no, Priority} */ /* {event queue no, Priority} */
{0, 4}, {0, 4},
{1, 0}, {1, 0},
...@@ -541,53 +540,49 @@ dm646x_queue_priority_mapping[][2] = { ...@@ -541,53 +540,49 @@ dm646x_queue_priority_mapping[][2] = {
{-1, -1}, {-1, -1},
}; };
static struct edma_soc_info edma_cc0_info = { static struct edma_soc_info dm646x_edma_pdata = {
.queue_priority_mapping = dm646x_queue_priority_mapping, .queue_priority_mapping = dm646x_queue_priority_mapping,
.default_queue = EVENTQ_1, .default_queue = EVENTQ_1,
}; };
static struct edma_soc_info *dm646x_edma_info[EDMA_MAX_CC] = {
&edma_cc0_info,
};
static struct resource edma_resources[] = { static struct resource edma_resources[] = {
{ {
.name = "edma_cc0", .name = "edma3_cc",
.start = 0x01c00000, .start = 0x01c00000,
.end = 0x01c00000 + SZ_64K - 1, .end = 0x01c00000 + SZ_64K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc0", .name = "edma3_tc0",
.start = 0x01c10000, .start = 0x01c10000,
.end = 0x01c10000 + SZ_1K - 1, .end = 0x01c10000 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc1", .name = "edma3_tc1",
.start = 0x01c10400, .start = 0x01c10400,
.end = 0x01c10400 + SZ_1K - 1, .end = 0x01c10400 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc2", .name = "edma3_tc2",
.start = 0x01c10800, .start = 0x01c10800,
.end = 0x01c10800 + SZ_1K - 1, .end = 0x01c10800 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma_tc3", .name = "edma3_tc3",
.start = 0x01c10c00, .start = 0x01c10c00,
.end = 0x01c10c00 + SZ_1K - 1, .end = 0x01c10c00 + SZ_1K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{ {
.name = "edma0", .name = "edma3_ccint",
.start = IRQ_CCINT0, .start = IRQ_CCINT0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "edma0_err", .name = "edma3_ccerrint",
.start = IRQ_CCERRINT, .start = IRQ_CCERRINT,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
...@@ -597,7 +592,7 @@ static struct resource edma_resources[] = { ...@@ -597,7 +592,7 @@ static struct resource edma_resources[] = {
static struct platform_device dm646x_edma_device = { static struct platform_device dm646x_edma_device = {
.name = "edma", .name = "edma",
.id = 0, .id = 0,
.dev.platform_data = dm646x_edma_info, .dev.platform_data = &dm646x_edma_pdata,
.num_resources = ARRAY_SIZE(edma_resources), .num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources, .resource = edma_resources,
}; };
...@@ -936,7 +931,7 @@ void dm646x_setup_vpif(struct vpif_display_config *display_config, ...@@ -936,7 +931,7 @@ void dm646x_setup_vpif(struct vpif_display_config *display_config,
int __init dm646x_init_edma(struct edma_rsv_info *rsv) int __init dm646x_init_edma(struct edma_rsv_info *rsv)
{ {
edma_cc0_info.rsv = rsv; dm646x_edma_pdata.rsv = rsv;
return platform_device_register(&dm646x_edma_device); return platform_device_register(&dm646x_edma_device);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7