Merge remote-tracking branch 'asoc/topic/component' into asoc-next

4 files changed, 29 insertions, 10 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 7decbd9b2340..fe04c67f8fb8 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -574,6 +574,10 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = {
         .ops = &fsl_ssi_dai_ops,
 };
 
+static const struct snd_soc_component_driver fsl_ssi_component = {
+        .name           = "fsl-ssi",
+};
+
 /* Show the statistics of a flag only if its interrupt is enabled.  The
  * compiler will optimze this code to a no-op if the interrupt is not
  * enabled.
@@ -782,7 +786,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         /* Register with ASoC */
         dev_set_drvdata(&pdev->dev, ssi_private);
 
-        ret = snd_soc_register_dai(&pdev->dev, &ssi_private->cpu_dai_drv);
+        ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
+                                         &ssi_private->cpu_dai_drv, 1);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
                 goto error_dev;
@@ -835,7 +840,7 @@ done:
 error_dai:
         if (ssi_private->ssi_on_imx)
                 platform_device_unregister(ssi_private->imx_pcm_pdev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
 error_dev:
         dev_set_drvdata(&pdev->dev, NULL);
@@ -873,7 +878,7 @@ static int fsl_ssi_remove(struct platform_device *pdev)
                 clk_disable_unprepare(ssi_private->clk);
                 clk_put(ssi_private->clk);
         }
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         device_remove_file(&pdev->dev, &ssi_private->dev_attr);
 
         free_irq(ssi_private->irq, ssi_private);
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 810c7eeb7b03..4a26d88d7236 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -413,6 +413,10 @@ static struct snd_soc_dai_driver imx_ac97_dai = {
         .ops = &imx_ssi_pcm_dai_ops,
 };
 
+static const struct snd_soc_component_driver imx_component = {
+        .name           = DRV_NAME,
+};
+
 static void setup_channel_to_ac97(struct imx_ssi *imx_ssi)
 {
         void __iomem *base = imx_ssi->base;
@@ -591,7 +595,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ssi);
 
-        ret = snd_soc_register_dai(&pdev->dev, dai);
+        ret = snd_soc_register_component(&pdev->dev, &imx_component,
+                                         dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "register DAI failed\n");
                 goto failed_register;
@@ -632,7 +637,7 @@ failed_pdev_alloc:
 failed_pdev_fiq_add:
         platform_device_put(ssi->soc_platform_pdev_fiq);
 failed_pdev_fiq_alloc:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 failed_register:
         release_mem_region(res->start, resource_size(res));
 failed_get_resource:
@@ -650,7 +655,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
         platform_device_unregister(ssi->soc_platform_pdev);
         platform_device_unregister(ssi->soc_platform_pdev_fiq);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         if (ssi->flags & IMX_SSI_USE_AC97)
                 ac97_ssi = NULL;
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index a4aec0488dd3..4141b35ef0bb 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -270,6 +270,9 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
         .ops = &psc_ac97_digital_ops,
 } };
 
+static const struct snd_soc_component_driver psc_ac97_component = {
+        .name           = DRV_NAME,
+};
 
 
 /* ---------------------------------------------------------------------
@@ -287,7 +290,8 @@ static int psc_ac97_of_probe(struct platform_device *op)
         if (rc != 0)
                 return rc;
 
-        rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
+        rc = snd_soc_register_component(&op->dev, &psc_ac97_component,
+                                        psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
         if (rc != 0) {
                 dev_err(&op->dev, "Failed to register DAI\n");
                 return rc;
@@ -313,7 +317,7 @@ static int psc_ac97_of_probe(struct platform_device *op)
 static int psc_ac97_of_remove(struct platform_device *op)
 {
         mpc5200_audio_dma_destroy(op);
-        snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai));
+        snd_soc_unregister_component(&op->dev);
         return 0;
 }
 
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index b95b966f25a0..f4efaadb80a2 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -148,6 +148,10 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
         .ops = &psc_i2s_dai_ops,
 } };
 
+static const struct snd_soc_component_driver psc_i2s_component = {
+        .name           = "mpc5200-i2s",
+};
+
 /* ---------------------------------------------------------------------
  * OF platform bus binding code:
  * - Probe/remove operations
@@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op)
         if (rc != 0)
                 return rc;
 
-        rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
+        rc = snd_soc_register_component(&op->dev, &psc_i2s_component,
+                                        psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
         if (rc != 0) {
                 pr_err("Failed to register DAI\n");
                 return rc;
@@ -208,7 +213,7 @@ static int psc_i2s_of_probe(struct platform_device *op)
 static int psc_i2s_of_remove(struct platform_device *op)
 {
         mpc5200_audio_dma_destroy(op);
-        snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai));
+        snd_soc_unregister_component(&op->dev);
         return 0;
 }