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

5 files changed, 31 insertions, 16 deletions

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index c724026a246f..f830c41f97dd 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -296,7 +296,6 @@ struct fsi_core {
 
 struct fsi_master {
         void __iomem *base;
-        int irq;
         struct fsi_priv fsia;
         struct fsi_priv fsib;
         const struct fsi_core *core;
@@ -1886,6 +1885,10 @@ static struct snd_soc_platform_driver fsi_soc_platform = {
         .pcm_free       = fsi_pcm_free,
 };
 
+static const struct snd_soc_component_driver fsi_soc_component = {
+        .name           = "fsi",
+};
+
 /*
  *              platform function
  */
@@ -2002,7 +2005,6 @@ static int fsi_probe(struct platform_device *pdev)
         }
 
         /* master setting */
-        master->irq             = irq;
         master->core            = core;
         spin_lock_init(&master->lock);
 
@@ -2046,10 +2048,10 @@ static int fsi_probe(struct platform_device *pdev)
                 goto exit_fsib;
         }
 
-        ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
-                                    ARRAY_SIZE(fsi_soc_dai));
+        ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component,
+                                    fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai));
         if (ret < 0) {
-                dev_err(&pdev->dev, "cannot snd dai register\n");
+                dev_err(&pdev->dev, "cannot snd component register\n");
                 goto exit_snd_soc;
         }
 
@@ -2074,7 +2076,7 @@ static int fsi_remove(struct platform_device *pdev)
 
         pm_runtime_disable(&pdev->dev);
 
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai));
+        snd_soc_unregister_component(&pdev->dev);
         snd_soc_unregister_platform(&pdev->dev);
 
         fsi_stream_remove(&master->fsia);
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index 4cc2d64ef476..af19f77b7bf0 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -310,15 +310,19 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = {
 #endif
 };
 
+static const struct snd_soc_component_driver sh4_hac_component = {
+        .name           = "sh4-hac",
+};
+
 static int hac_soc_platform_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dais(&pdev->dev, sh4_hac_dai,
-                        ARRAY_SIZE(sh4_hac_dai));
+        return snd_soc_register_component(&pdev->dev, &sh4_hac_component,
+                                          sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai));
 }
 
 static int hac_soc_platform_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai));
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index 8526e1edaf45..5014a884afee 100644
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
@@ -153,7 +153,7 @@ static int migor_dai_init(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_dai_link migor_dai = {
         .name = "wm8978",
         .stream_name = "WM8978",
-        .cpu_dai_name = "siu-i2s-dai",
+        .cpu_dai_name = "siu-pcm-audio",
         .codec_dai_name = "wm8978-hifi",
         .platform_name = "siu-pcm-audio",
         .codec_name = "wm8978.0-001a",
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c
index 34facdc9e4ac..9dc24ffa892a 100644
--- a/sound/soc/sh/siu_dai.c
+++ b/sound/soc/sh/siu_dai.c
@@ -726,6 +726,10 @@ static struct snd_soc_dai_driver siu_i2s_dai = {
         .ops = &siu_dai_ops,
 };
 
+static const struct snd_soc_component_driver siu_i2s_component = {
+        .name           = "siu-i2s",
+};
+
 static int siu_probe(struct platform_device *pdev)
 {
         const struct firmware *fw_entry;
@@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev)
         dev_set_drvdata(&pdev->dev, info);
 
         /* register using ARRAY version so we can keep dai name */
-        ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1);
+        ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component,
+                                         &siu_i2s_dai, 1);
         if (ret < 0)
                 goto edaiinit;
 
@@ -796,7 +801,7 @@ static int siu_probe(struct platform_device *pdev)
         return ret;
 
 esocregp:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 edaiinit:
         iounmap(info->reg);
 emapreg:
@@ -823,7 +828,7 @@ static int siu_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
 
         snd_soc_unregister_platform(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         iounmap(info->reg);
         iounmap(info->yram);
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index c8e73a703934..e889405ebd38 100644
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -379,15 +379,19 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = {
 #endif
 };
 
+static const struct snd_soc_component_driver sh4_ssi_component = {
+        .name           = "sh4-ssi",
+};
+
 static int sh4_soc_dai_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai,
-                        ARRAY_SIZE(sh4_ssi_dai));
+        return snd_soc_register_component(&pdev->dev, &sh4_ssi_component,
+                                          sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai));
 }
 
 static int sh4_soc_dai_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }