4 files changed, 28 insertions, 10 deletions
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index 9140c4abafbc..a64779980177 100644
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -405,6 +405,10 @@ struct snd_soc_dai_driver mmp_sspa_dai = {
        .ops = &mmp_sspa_dai_ops,
 };
+static const struct snd_soc_component_driver mmp_sspa_component = {
+        .name           = "mmp-sspa",
+};
 static int asoc_mmp_sspa_probe(struct platform_device *pdev)
 {
        struct sspa_priv *priv;
@@ -450,7 +454,8 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev)
        priv->dai_fmt = (unsigned int) -1;
        platform_set_drvdata(pdev, priv);
-        return snd_soc_register_dai(&pdev->dev, &mmp_sspa_dai);
+        return snd_soc_register_component(&pdev->dev, &mmp_sspa_component,
+                                          &mmp_sspa_dai, 1);
 }
 static int asoc_mmp_sspa_remove(struct platform_device *pdev)
@@ -460,7 +465,7 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev)
        clk_disable(priv->audio_clk);
        clk_put(priv->audio_clk);
        clk_put(priv->sysclk);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
        return 0;
 }
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index d3eb0c2eec77..6f4dd7543e82 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -794,14 +794,19 @@ static struct snd_soc_dai_driver pxa_ssp_dai = {
                .ops = &pxa_ssp_dai_ops,
 };
+static const struct snd_soc_component_driver pxa_ssp_component = {
+        .name           = "pxa-ssp",
+};
 static int asoc_ssp_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai);
+        return snd_soc_register_component(&pdev->dev, &pxa_ssp_component,
+                                          &pxa_ssp_dai, 1);
 }
 static int asoc_ssp_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
        return 0;
 }
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 4b0a009bd683..57ea8e6c5488 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -47,6 +47,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = {
        .warm_reset     = pxa2xx_ac97_warm_reset,
        .reset  = pxa2xx_ac97_cold_reset,
 };
+EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
        .name                   = "AC97 PCM Stereo out",
@@ -232,7 +233,9 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = {
 },
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
+static const struct snd_soc_component_driver pxa_ac97_component = {
+        .name           = "pxa-ac97",
+};
 static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
 {
@@ -245,13 +248,13 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
         * driver to do interesting things with the clocking to get us up
         * and running.
         */
-        return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver,
+        return snd_soc_register_component(&pdev->dev, &pxa_ac97_component,
-                        ARRAY_SIZE(pxa_ac97_dai_driver));
+                                          pxa_ac97_dai_driver, ARRAY_SIZE(pxa_ac97_dai_driver));
 }
 static int pxa2xx_ac97_dev_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver));
+        snd_soc_unregister_component(&pdev->dev);
        return 0;
 }
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 6b1a06f67564..f7ca71664112 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -360,14 +360,19 @@ static struct snd_soc_dai_driver pxa_i2s_dai = {
        .symmetric_rates = 1,
 };
+static const struct snd_soc_component_driver pxa_i2s_component = {
+        .name           = "pxa-i2s",
+};
 static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dai(&pdev->dev, &pxa_i2s_dai);
+        return snd_soc_register_component(&pdev->dev, &pxa_i2s_component,
+                                          &pxa_i2s_dai, 1);
 }
 static int pxa2xx_i2s_drv_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
        return 0;
 }