diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-15 11:13:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-15 11:13:53 +0100 |
| commit | 39c36ad00ba59eafa8115c797ace4f3dc7fdf7b0 (patch) | |
| tree | dffcc4adbf21514f43f1ace39ea8a8e6735903d5 /sound/soc/omap/omap-dmic.c | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | 9ab1fac4829b3da0ba4d3f44d95d3e8ad13e6629 (diff) | |
| download | blackbird-op-linux-39c36ad00ba59eafa8115c797ace4f3dc7fdf7b0.tar.gz blackbird-op-linux-39c36ad00ba59eafa8115c797ace4f3dc7fdf7b0.zip | |
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
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 { struct mutex mutex; struct snd_dmaengine_dai_dma_data dma_data; - unsigned int dma_req; }; 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) } dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG; - res = platform_get_resource(pdev, IORESOURCE_DMA, 0); - if (!res) { - dev_err(dmic->dev, "invalid dma resource\n"); - ret = -ENODEV; - goto err_put_clk; - } - - dmic->dma_req = res->start; - dmic->dma_data.filter_data = &dmic->dma_req; + dmic->dma_data.filter_data = "up_link"; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); if (!res) { |
