4 files changed, 28 insertions, 8 deletions

diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index 8e41bcb020eb..490217325975 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -282,6 +282,10 @@ static struct snd_soc_dai_driver bfin_ac97_dai = {
                 .formats = SNDRV_PCM_FMTBIT_S16_LE, },
 };
 
+static const struct snd_soc_component_driver bfin_ac97_component = {
+        .name           = "bfin-ac97",
+};
+
 static int asoc_bfin_ac97_probe(struct platform_device *pdev)
 {
         struct sport_device *sport_handle;
@@ -331,7 +335,8 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
                 goto sport_config_err;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &bfin_ac97_dai);
+        ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component,
+                                         &bfin_ac97_dai, 1);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 goto sport_config_err;
@@ -356,7 +361,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev)
 {
         struct sport_device *sport_handle = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
         gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 168d88bccb41..dd0c2a4f83a3 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -245,6 +245,10 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = {
         .ops = &bf5xx_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver bf5xx_i2s_component = {
+        .name           = "bf5xx-i2s",
+};
+
 static int bf5xx_i2s_probe(struct platform_device *pdev)
 {
         struct sport_device *sport_handle;
@@ -257,7 +261,8 @@ static int bf5xx_i2s_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         /* register with the ASoC layers */
-        ret = snd_soc_register_dai(&pdev->dev, &bf5xx_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &bf5xx_i2s_component,
+                                         &bf5xx_i2s_dai, 1);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 sport_done(sport_handle);
@@ -273,7 +278,7 @@ static int bf5xx_i2s_remove(struct platform_device *pdev)
 
         pr_debug("%s enter\n", __func__);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
 
         return 0;
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c
index c1e516ec53ad..69e9a3e935bd 100644
--- a/sound/soc/blackfin/bf5xx-tdm.c
+++ b/sound/soc/blackfin/bf5xx-tdm.c
@@ -249,6 +249,10 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = {
         .ops = &bf5xx_tdm_dai_ops,
 };
 
+static const struct snd_soc_component_driver bf5xx_tdm_component = {
+        .name           = "bf5xx-tdm",
+};
+
 static int bfin_tdm_probe(struct platform_device *pdev)
 {
         struct sport_device *sport_handle;
@@ -282,7 +286,8 @@ static int bfin_tdm_probe(struct platform_device *pdev)
                 goto sport_config_err;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &bf5xx_tdm_dai);
+        ret = snd_soc_register_component(&pdev->dev, &bf5xx_tdm_component,
+                                         &bf5xx_tdm_dai, 1);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 goto sport_config_err;
@@ -299,7 +304,7 @@ static int bfin_tdm_remove(struct platform_device *pdev)
 {
         struct sport_device *sport_handle = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
 
         return 0;
diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c
index 8f337972f438..c02405cc007d 100644
--- a/sound/soc/blackfin/bf6xx-i2s.c
+++ b/sound/soc/blackfin/bf6xx-i2s.c
@@ -186,6 +186,10 @@ static struct snd_soc_dai_driver bfin_i2s_dai = {
         .ops = &bfin_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver bfin_i2s_component = {
+        .name           = "bfin-i2s",
+};
+
 static int bfin_i2s_probe(struct platform_device *pdev)
 {
         struct sport_device *sport;
@@ -197,7 +201,8 @@ static int bfin_i2s_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         /* register with the ASoC layers */
-        ret = snd_soc_register_dai(dev, &bfin_i2s_dai);
+        ret = snd_soc_register_component(dev, &bfin_i2s_component,
+                                         &bfin_i2s_dai, 1);
         if (ret) {
                 dev_err(dev, "Failed to register DAI: %d\n", ret);
                 sport_delete(sport);
@@ -212,7 +217,7 @@ static int bfin_i2s_remove(struct platform_device *pdev)
 {
         struct sport_device *sport = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_delete(sport);
 
         return 0;