ASoC: tegra: tegra_wm9712: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>alistair/sunxi64-5.4-dsi
parent
5e703b906e
commit
ec7687d9a1
|
@ -49,12 +49,16 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
|
return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SND_SOC_DAILINK_DEFS(hifi,
|
||||||
|
DAILINK_COMP_ARRAY(COMP_EMPTY()),
|
||||||
|
DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi")),
|
||||||
|
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
||||||
|
|
||||||
static struct snd_soc_dai_link tegra_wm9712_dai = {
|
static struct snd_soc_dai_link tegra_wm9712_dai = {
|
||||||
.name = "AC97 HiFi",
|
.name = "AC97 HiFi",
|
||||||
.stream_name = "AC97 HiFi",
|
.stream_name = "AC97 HiFi",
|
||||||
.codec_dai_name = "wm9712-hifi",
|
|
||||||
.codec_name = "wm9712-codec",
|
|
||||||
.init = tegra_wm9712_init,
|
.init = tegra_wm9712_init,
|
||||||
|
SND_SOC_DAILINK_REG(hifi),
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_wm9712 = {
|
static struct snd_soc_card snd_soc_tegra_wm9712 = {
|
||||||
|
@ -101,16 +105,16 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto codec_unregister;
|
goto codec_unregister;
|
||||||
|
|
||||||
tegra_wm9712_dai.cpu_of_node = of_parse_phandle(np,
|
tegra_wm9712_dai.cpus->of_node = of_parse_phandle(np,
|
||||||
"nvidia,ac97-controller", 0);
|
"nvidia,ac97-controller", 0);
|
||||||
if (!tegra_wm9712_dai.cpu_of_node) {
|
if (!tegra_wm9712_dai.cpus->of_node) {
|
||||||
dev_err(&pdev->dev,
|
dev_err(&pdev->dev,
|
||||||
"Property 'nvidia,ac97-controller' missing or invalid\n");
|
"Property 'nvidia,ac97-controller' missing or invalid\n");
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto codec_unregister;
|
goto codec_unregister;
|
||||||
}
|
}
|
||||||
|
|
||||||
tegra_wm9712_dai.platform_of_node = tegra_wm9712_dai.cpu_of_node;
|
tegra_wm9712_dai.platforms->of_node = tegra_wm9712_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)
|
||||||
|
|
Loading…
Reference in New Issue