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

1 files changed, 11 insertions, 5 deletions

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 6bbeb0bf1a73..82ebb1a51479 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -963,6 +963,10 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
         .delay = i2s_delay,
 };
 
+static const struct snd_soc_component_driver samsung_i2s_component = {
+        .name           = "samsung-i2s",
+};
+
 #define SAMSUNG_I2S_RATES       SNDRV_PCM_RATE_8000_96000
 
 #define SAMSUNG_I2S_FMTS        (SNDRV_PCM_FMTBIT_S8 | \
@@ -1114,8 +1118,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "Unable to get drvdata\n");
                         return -EFAULT;
                 }
-                snd_soc_register_dai(&sec_dai->pdev->dev,
-                        &sec_dai->i2s_dai_drv);
+                snd_soc_register_component(&sec_dai->pdev->dev,
+                                           &samsung_i2s_component,
+                                           &sec_dai->i2s_dai_drv, 1);
                 asoc_dma_platform_register(&pdev->dev);
                 return 0;
         }
@@ -1244,7 +1249,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 }
         }
 
-        snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv);
+        snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,
+                                   &pri_dai->i2s_dai_drv, 1);
 
         pm_runtime_enable(&pdev->dev);
 
@@ -1283,7 +1289,7 @@ static int samsung_i2s_remove(struct platform_device *pdev)
         i2s->sec_dai = NULL;
 
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }
@@ -1298,7 +1304,7 @@ static struct platform_device_id samsung_i2s_driver_ids[] = {
         },
         {},
 };
-MODULE_DEVICE_TABLE(platform, samsung-i2s-driver-ids);
+MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids);
 
 #ifdef CONFIG_OF
 static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = {