5 files changed, 41 insertions, 21 deletions

diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 336dcdd3e8a4..b5cee92f82e8 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -248,6 +248,10 @@ static struct snd_soc_dai_driver tegra20_ac97_dai = {
         .ops = &tegra20_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver tegra20_ac97_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra20_ac97_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -398,7 +402,8 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
         ac97->playback_dma_data.width = 32;
         ac97->playback_dma_data.req_sel = of_dma[1];
 
-        ret = snd_soc_register_dais(&pdev->dev, &tegra20_ac97_dai, 1);
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
+                                         &tegra20_ac97_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -408,7 +413,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
@@ -434,8 +439,8 @@ err_asoc_utils_fini:
         tegra_asoc_utils_fini(&ac97->util_data);
 err_unregister_pcm:
         tegra_pcm_platform_unregister(&pdev->dev);
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_clk_put:
         clk_put(ac97->clk_ac97);
 err:
@@ -447,7 +452,7 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
         struct tegra20_ac97 *ac97 = dev_get_drvdata(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         tegra_asoc_utils_fini(&ac97->util_data);
 
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index caa772de5a18..8b1ceb82c86f 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -276,6 +276,10 @@ static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {
         .symmetric_rates = 1,
 };
 
+static const struct snd_soc_component_driver tegra20_i2s_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -419,7 +423,8 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
                         goto err_pm_disable;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &i2s->dai);
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,
+                                         &i2s->dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -429,13 +434,13 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_suspend:
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra20_i2s_runtime_suspend(&pdev->dev);
@@ -456,7 +461,7 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev)
                 tegra20_i2s_runtime_suspend(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(i2s->clk_i2s);
 
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 04771d14d343..6fce0be5eaa3 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -182,6 +182,10 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = {
         .ops = &tegra20_spdif_dai_ops,
 };
 
+static const struct snd_soc_component_driver tegra20_spdif_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -329,7 +333,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
                         goto err_pm_disable;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &tegra20_spdif_dai);
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,
+                                   &tegra20_spdif_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -339,13 +344,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_suspend:
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra20_spdif_runtime_suspend(&pdev->dev);
@@ -366,7 +371,7 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev)
                 tegra20_spdif_runtime_suspend(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(spdif->clk_spdif_out);
 
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index f4e1ce82750a..f138d8fea977 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -336,6 +336,10 @@ static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {
         .symmetric_rates = 1,
 };
 
+static const struct snd_soc_component_driver tegra30_i2s_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -464,7 +468,8 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
                         goto err_pm_disable;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &i2s->dai);
+        ret = snd_soc_register_component(&pdev->dev, &tegra30_i2s_component,
+                                   &i2s->dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -474,13 +479,13 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_suspend:
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra30_i2s_runtime_suspend(&pdev->dev);
@@ -501,7 +506,7 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev)
                 tegra30_i2s_runtime_suspend(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(i2s->clk_i2s);
 
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 68d42403d9b5..6839f88167d0 100644
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -55,7 +55,7 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_dai_link tegra_wm9712_dai = {
         .name = "AC97 HiFi",
         .stream_name = "AC97 HiFi",
-        .cpu_dai_name = "tegra-ac97-pcm",
+        .cpu_dai_name = "tegra20-ac97",
         .codec_dai_name = "wm9712-hifi",
         .codec_name = "wm9712-codec",
         .init = tegra_wm9712_init,