Commit 5e703b90 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: tegra: tegra_wm8903: use modern dai_link style

ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5a44ad1e
...@@ -209,15 +209,20 @@ static int tegra_wm8903_remove(struct snd_soc_card *card) ...@@ -209,15 +209,20 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)
return 0; return 0;
} }
SND_SOC_DAILINK_DEFS(hifi,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8903-hifi")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link tegra_wm8903_dai = { static struct snd_soc_dai_link tegra_wm8903_dai = {
.name = "WM8903", .name = "WM8903",
.stream_name = "WM8903 PCM", .stream_name = "WM8903 PCM",
.codec_dai_name = "wm8903-hifi",
.init = tegra_wm8903_init, .init = tegra_wm8903_init,
.ops = &tegra_wm8903_ops, .ops = &tegra_wm8903_ops,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
SND_SOC_DAILINK_REG(hifi),
}; };
static struct snd_soc_card snd_soc_tegra_wm8903 = { static struct snd_soc_card snd_soc_tegra_wm8903 = {
...@@ -316,25 +321,25 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev) ...@@ -316,25 +321,25 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err; goto err;
tegra_wm8903_dai.codec_of_node = of_parse_phandle(np, tegra_wm8903_dai.codecs->of_node = of_parse_phandle(np,
"nvidia,audio-codec", 0); "nvidia,audio-codec", 0);
if (!tegra_wm8903_dai.codec_of_node) { if (!tegra_wm8903_dai.codecs->of_node) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Property 'nvidia,audio-codec' missing or invalid\n"); "Property 'nvidia,audio-codec' missing or invalid\n");
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
tegra_wm8903_dai.cpu_of_node = of_parse_phandle(np, tegra_wm8903_dai.cpus->of_node = of_parse_phandle(np,
"nvidia,i2s-controller", 0); "nvidia,i2s-controller", 0);
if (!tegra_wm8903_dai.cpu_of_node) { if (!tegra_wm8903_dai.cpus->of_node) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Property 'nvidia,i2s-controller' missing or invalid\n"); "Property 'nvidia,i2s-controller' missing or invalid\n");
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
tegra_wm8903_dai.platform_of_node = tegra_wm8903_dai.cpu_of_node; tegra_wm8903_dai.platforms->of_node = tegra_wm8903_dai.cpus->of_node;
ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment