ASoC: tegra: remove usage of rtd->codec

[cascardo/linux.git] / sound / soc / tegra / trimslice.c

diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index 0fd115e..e69a4f7 100644 (file)
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -27,6 +27,7 @@
 #include <asm/mach-types.h>
 
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
@@ -51,8 +52,7 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-       struct snd_soc_codec *codec = rtd->codec;
+       struct snd_soc_codec *codec = codec_dai->codec;
        struct snd_soc_card *card = codec->card;
        struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);
        int srate, mclk;
@@ -67,24 +67,6 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream,
                return err;
        }
 
-       err = snd_soc_dai_set_fmt(codec_dai,
-                                       SND_SOC_DAIFMT_I2S |
-                                       SND_SOC_DAIFMT_NB_NF |
-                                       SND_SOC_DAIFMT_CBS_CFS);
-       if (err < 0) {
-               dev_err(card->dev, "codec_dai fmt not set\n");
-               return err;
-       }
-
-       err = snd_soc_dai_set_fmt(cpu_dai,
-                                       SND_SOC_DAIFMT_I2S |
-                                       SND_SOC_DAIFMT_NB_NF |
-                                       SND_SOC_DAIFMT_CBS_CFS);
-       if (err < 0) {
-               dev_err(card->dev, "cpu_dai fmt not set\n");
-               return err;
-       }
-
        err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
                                        SND_SOC_CLOCK_IN);
        if (err < 0) {
@@ -120,6 +102,9 @@ static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
        .cpu_dai_name = "tegra20-i2s.0",
        .codec_dai_name = "tlv320aic23-hifi",
        .ops = &trimslice_asoc_ops,
+       .dai_fmt = SND_SOC_DAIFMT_I2S |
+                  SND_SOC_DAIFMT_NB_NF |
+                  SND_SOC_DAIFMT_CBS_CFS,
 };
 
 static struct snd_soc_card snd_soc_trimslice = {
@@ -149,6 +134,32 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
                goto err;
        }
 
+       if (pdev->dev.of_node) {
+               trimslice_tlv320aic23_dai.codec_name = NULL;
+               trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(
+                               pdev->dev.of_node, "nvidia,audio-codec", 0);
+               if (!trimslice_tlv320aic23_dai.codec_of_node) {
+                       dev_err(&pdev->dev,
+                               "Property 'nvidia,audio-codec' missing or invalid\n");
+                       ret = -EINVAL;
+                       goto err;
+               }
+
+               trimslice_tlv320aic23_dai.cpu_dai_name = NULL;
+               trimslice_tlv320aic23_dai.cpu_of_node = of_parse_phandle(
+                               pdev->dev.of_node, "nvidia,i2s-controller", 0);
+               if (!trimslice_tlv320aic23_dai.cpu_of_node) {
+                       dev_err(&pdev->dev,
+                               "Property 'nvidia,i2s-controller' missing or invalid\n");
+                       ret = -EINVAL;
+                       goto err;
+               }
+
+               trimslice_tlv320aic23_dai.platform_name = NULL;
+               trimslice_tlv320aic23_dai.platform_of_node =
+                               trimslice_tlv320aic23_dai.cpu_of_node;
+       }
+
        ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
        if (ret)
                goto err;
@@ -184,10 +195,17 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct of_device_id trimslice_of_match[] __devinitconst = {
+       { .compatible = "nvidia,tegra-audio-trimslice", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, trimslice_of_match);
+
 static struct platform_driver tegra_snd_trimslice_driver = {
        .driver = {
                .name = DRV_NAME,
                .owner = THIS_MODULE,
+               .of_match_table = trimslice_of_match,
        },
        .probe = tegra_snd_trimslice_probe,
        .remove = __devexit_p(tegra_snd_trimslice_remove),