OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cnl: dma: refine dma probe 

Probe each dma individually
This commit is contained in:
Rander Wang 2018-03-07 10:42:37 +08:00 committed by Liam Girdwood
parent 1a784a9311
commit 0857b21acb
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/drivers/dw-dma.c
View File

@ -1048,14 +1048,7 @@ static void dw_dma_irq_handler(void *data)
status_intr = dw_read(dma, DW_INTR_STATUS);
if (!status_intr) {
#ifdef CONFIG_CANNONLAKE
dma++;
status_intr = dw_read(dma, DW_INTR_STATUS);
if (!status_intr)
trace_dma_error("eI0");
#else
trace_dma_error("eI0");
#endif
}
tracev_dma("DIr");
@ -1148,31 +1141,22 @@ static void dw_dma_irq_handler(void *data)
static int dw_dma_probe(struct dma *dma)
{
struct dma_pdata *dw_pdata;
struct dma *dmac = dma;
int i;
#ifdef CONFIG_CANNONLAKE
int j;
for (j = 0; j < MAX_GPDMA_COUNT; j++)
#endif
{
/* allocate private data */
dw_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM,
sizeof(*dw_pdata));
dma_set_drvdata(dmac, dw_pdata);
/* allocate private data */
dw_pdata = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM,
sizeof(*dw_pdata));
dma_set_drvdata(dma, dw_pdata);
spinlock_init(&dmac->lock);
spinlock_init(&dma->lock);
dw_dma_setup(dmac);
dw_dma_setup(dma);
/* init work */
for (i = 0; i < DW_MAX_CHAN; i++) {
dw_pdata->chan[i].dma = dmac;
dw_pdata->chan[i].channel = i;
dw_pdata->chan[i].status = COMP_STATE_INIT;
}
dmac++;
/* init work */
for (i = 0; i < DW_MAX_CHAN; i++) {
dw_pdata->chan[i].dma = dma;
dw_pdata->chan[i].channel = i;
dw_pdata->chan[i].status = COMP_STATE_INIT;
}
/* register our IRQ handler */

5
src/platform/cannonlake/platform.c
View File

@ -259,6 +259,11 @@ int platform_init(struct reef *reef)
return -ENODEV;
dma_probe(dmac);
dmac = dma_get(DMA_GP_LP_DMAC1);
if (!dmac)
return -ENODEV;
dma_probe(dmac);
dmac = dma_get(DMA_HOST_OUT_DMAC);
if (!dmac)
return -ENODEV;