mirror of https://gitee.com/openkylin/linux.git
ASoC: tegra: trimslice: 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>
This commit is contained in:
parent
efefce5422
commit
706e20515e
|
@ -91,14 +91,19 @@ static const struct snd_soc_dapm_route trimslice_audio_map[] = {
|
|||
{"RLINEIN", NULL, "Line In"},
|
||||
};
|
||||
|
||||
SND_SOC_DAILINK_DEFS(single_dsp,
|
||||
DAILINK_COMP_ARRAY(COMP_EMPTY()),
|
||||
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic23-hifi")),
|
||||
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
||||
|
||||
static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
|
||||
.name = "TLV320AIC23",
|
||||
.stream_name = "AIC23",
|
||||
.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,
|
||||
SND_SOC_DAILINK_REG(single_dsp),
|
||||
};
|
||||
|
||||
static struct snd_soc_card snd_soc_trimslice = {
|
||||
|
@ -129,26 +134,26 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)
|
|||
card->dev = &pdev->dev;
|
||||
snd_soc_card_set_drvdata(card, trimslice);
|
||||
|
||||
trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(np,
|
||||
trimslice_tlv320aic23_dai.codecs->of_node = of_parse_phandle(np,
|
||||
"nvidia,audio-codec", 0);
|
||||
if (!trimslice_tlv320aic23_dai.codec_of_node) {
|
||||
if (!trimslice_tlv320aic23_dai.codecs->of_node) {
|
||||
dev_err(&pdev->dev,
|
||||
"Property 'nvidia,audio-codec' missing or invalid\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
trimslice_tlv320aic23_dai.cpu_of_node = of_parse_phandle(np,
|
||||
trimslice_tlv320aic23_dai.cpus->of_node = of_parse_phandle(np,
|
||||
"nvidia,i2s-controller", 0);
|
||||
if (!trimslice_tlv320aic23_dai.cpu_of_node) {
|
||||
if (!trimslice_tlv320aic23_dai.cpus->of_node) {
|
||||
dev_err(&pdev->dev,
|
||||
"Property 'nvidia,i2s-controller' missing or invalid\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
trimslice_tlv320aic23_dai.platform_of_node =
|
||||
trimslice_tlv320aic23_dai.cpu_of_node;
|
||||
trimslice_tlv320aic23_dai.platforms->of_node =
|
||||
trimslice_tlv320aic23_dai.cpus->of_node;
|
||||
|
||||
ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
|
||||
if (ret)
|
||||
|
|
Loading…
Reference in New Issue