diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-04-16 15:46:16 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-04-18 18:00:35 +0100 |
| commit | 64241425b8eaf46c971b6ba400c21f71979e6782 (patch) | |
| tree | 3b77d480607f5d6e6ad1622cfc8a495d168fd1c1 /sound/soc/omap/omap-mcbsp.c | |
| parent | ASoC: omap-mcbsp: Assign the dai DMA data at earlier time (diff) | |
| download | linux-dev-64241425b8eaf46c971b6ba400c21f71979e6782.tar.xz linux-dev-64241425b8eaf46c971b6ba400c21f71979e6782.zip | |
ASoC: omap-mcbsp: Bind the platform driver to the dai driver when loading
Use the same device for the platform driver when registering as the dai
driver. This will enable us to clean up some DT booted cases.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 4525190d5599..af2764adf252 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -38,6 +38,7 @@ #include <linux/platform_data/asoc-ti-mcbsp.h> #include "mcbsp.h" #include "omap-mcbsp.h" +#include "omap-pcm.h" #define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000) @@ -800,11 +801,15 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mcbsp); ret = omap_mcbsp_init(pdev); - if (!ret) - return snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, - &omap_mcbsp_dai, 1); + if (ret) + return ret; - return ret; + ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, + &omap_mcbsp_dai, 1); + if (ret) + return ret; + + return omap_pcm_platform_register(&pdev->dev); } static int asoc_mcbsp_remove(struct platform_device *pdev) |