diff options
Diffstat (limited to 'sound/soc/omap/omap-dmic.c')
| -rw-r--r-- | sound/soc/omap/omap-dmic.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 2ad0370146fd..4db1f8e6e172 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c | |||
| @@ -57,7 +57,6 @@ struct omap_dmic { | |||
| 57 | struct mutex mutex; | 57 | struct mutex mutex; |
| 58 | 58 | ||
| 59 | struct snd_dmaengine_dai_dma_data dma_data; | 59 | struct snd_dmaengine_dai_dma_data dma_data; |
| 60 | unsigned int dma_req; | ||
| 61 | }; | 60 | }; |
| 62 | 61 | ||
| 63 | static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) | 62 | static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) |
| @@ -478,15 +477,7 @@ static int asoc_dmic_probe(struct platform_device *pdev) | |||
| 478 | } | 477 | } |
| 479 | dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG; | 478 | dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG; |
| 480 | 479 | ||
| 481 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); | 480 | dmic->dma_data.filter_data = "up_link"; |
| 482 | if (!res) { | ||
| 483 | dev_err(dmic->dev, "invalid dma resource\n"); | ||
| 484 | ret = -ENODEV; | ||
| 485 | goto err_put_clk; | ||
| 486 | } | ||
| 487 | |||
| 488 | dmic->dma_req = res->start; | ||
| 489 | dmic->dma_data.filter_data = &dmic->dma_req; | ||
| 490 | 481 | ||
| 491 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); | 482 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); |
| 492 | if (!res) { | 483 | if (!res) { |
