浏览代码

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>
Peter Ujfalusi 11 年之前
父节点
当前提交
64241425b8
共有 1 个文件被更改,包括 9 次插入4 次删除
  1. 9 4
      sound/soc/omap/omap-mcbsp.c

+ 9 - 4
sound/soc/omap/omap-mcbsp.c

@@ -38,6 +38,7 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include "mcbsp.h"
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
 #include "omap-mcbsp.h"
+#include "omap-pcm.h"
 
 
 #define OMAP_MCBSP_RATES	(SNDRV_PCM_RATE_8000_96000)
 #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);
 	platform_set_drvdata(pdev, mcbsp);
 
 
 	ret = omap_mcbsp_init(pdev);
 	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)
 static int asoc_mcbsp_remove(struct platform_device *pdev)