diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-07-11 14:35:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-11 17:38:00 +0100 |
| commit | 2ebef44789223389708505e33c67d44e9f999d4a (patch) | |
| tree | 4fd19740f1c487a9386bd8996d4e37c3bf2e5372 /sound/soc | |
| parent | a8035f073cb508a0c1223db2662510575627b41d (diff) | |
| download | blackbird-op-linux-2ebef44789223389708505e33c67d44e9f999d4a.tar.gz blackbird-op-linux-2ebef44789223389708505e33c67d44e9f999d4a.zip | |
ASoC: omap-dmic: Do not use platform_get_resource_byname() for DMA
The DMA resource no longer available via this API when booting with DT.
DMIC is only available on OMAP4/5 and both can boot with DT only.
Set the dma_data.filter_data to the DMA name which will be used by omap-pcm
to request the DMA channel.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
| -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) { |
