Skip to content

Commit 7e042e9

Browse files
lrgirdwolgirdwood
authored andcommitted
dma: bdw and byt dont have DMIC so remove from DMA caps.
Looks like a copy and paste error. BDW also has SSP as target for DMAC0 which is forbidden by the direction capability. Align with the direction cap to avoid confusion. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
1 parent df37696 commit 7e042e9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/platform/baytrail/lib/dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = {
127127
DMA_DIR_DEV_TO_MEM | DMA_DIR_DEV_TO_DEV |
128128
DMA_DIR_HMEM_TO_LMEM | DMA_DIR_LMEM_TO_HMEM,
129129
.caps = DMA_CAP_GP_HP,
130-
.devs = DMA_DEV_SSP | DMA_DEV_DMIC | DMA_DEV_HOST,
130+
.devs = DMA_DEV_SSP | DMA_DEV_HOST,
131131
.base = DMA0_BASE,
132132
.channels = 8,
133133
.irq = IRQ_NUM_EXT_DMAC0,
@@ -142,7 +142,7 @@ SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = {
142142
DMA_DIR_DEV_TO_MEM | DMA_DIR_DEV_TO_DEV |
143143
DMA_DIR_HMEM_TO_LMEM | DMA_DIR_LMEM_TO_HMEM,
144144
.caps = DMA_CAP_GP_HP,
145-
.devs = DMA_DEV_SSP | DMA_DEV_DMIC | DMA_DEV_HOST,
145+
.devs = DMA_DEV_SSP | DMA_DEV_HOST,
146146
.base = DMA1_BASE,
147147
.channels = 8,
148148
.irq = IRQ_NUM_EXT_DMAC1,

src/platform/haswell/lib/dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = {
9191
.base = DMA0_BASE,
9292
.dir = DMA_DIR_MEM_TO_MEM,
9393
.caps = DMA_CAP_GP_HP | DMA_CAP_GP_LP,
94-
.devs = DMA_DEV_SSP | DMA_DEV_DMIC | DMA_DEV_HOST,
94+
.devs = DMA_DEV_HOST,
9595
.irq = IRQ_NUM_EXT_DMAC0,
9696
.drv_plat_data = &dmac0,
9797
.channels = 8,
@@ -106,7 +106,7 @@ SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = {
106106
DMA_DIR_DEV_TO_MEM | DMA_DIR_DEV_TO_DEV |
107107
DMA_DIR_HMEM_TO_LMEM | DMA_DIR_LMEM_TO_HMEM,
108108
.caps = DMA_CAP_GP_HP | DMA_CAP_GP_LP,
109-
.devs = DMA_DEV_SSP | DMA_DEV_DMIC | DMA_DEV_HOST,
109+
.devs = DMA_DEV_SSP | DMA_DEV_HOST,
110110
.irq = IRQ_NUM_EXT_DMAC1,
111111
.drv_plat_data = &dmac1,
112112
.channels = 8,

0 commit comments

Comments
 (0)