redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: samsung: tm2_wm5110: use snd_soc_dai_link_component for aux_dev 

We can use snd_soc_dai_link_component to specify aux_dev.
Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/87lfw46w9g.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
alistair/sunxi64-5.4-dsi
Kuninori Morimoto 2019-08-08 14:54:20 +09:00 committed by Mark Brown
parent 2d946aaa80
commit 124749194a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/samsung/tm2_wm5110.c
View File

@ -307,7 +307,6 @@ static struct snd_soc_aux_dev tm2_speaker_amp_dev;
static int tm2_late_probe(struct snd_soc_card *card)
{
struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card);
struct snd_soc_dai_link_component dlc = { 0 };
unsigned int ch_map[] = { 0, 1 };
struct snd_soc_dai *amp_pdm_dai;
struct snd_soc_pcm_runtime *rtd;
@ -334,8 +333,7 @@ static int tm2_late_probe(struct snd_soc_card *card)
return ret;
}
dlc.of_node = tm2_speaker_amp_dev.codec_of_node;
amp_pdm_dai = snd_soc_find_dai(&dlc);
amp_pdm_dai = snd_soc_find_dai(&tm2_speaker_amp_dev.dlc);
if (!amp_pdm_dai)
return -ENODEV;
@ -532,9 +530,9 @@ static int tm2_probe(struct platform_device *pdev)
return ret;
}
card->aux_dev[0].codec_of_node = of_parse_phandle(dev->of_node,
card->aux_dev[0].dlc.of_node = of_parse_phandle(dev->of_node,
"audio-amplifier", 0);
if (!card->aux_dev[0].codec_of_node) {
if (!card->aux_dev[0].dlc.of_node) {
dev_err(dev, "audio-amplifier property invalid or missing\n");
return -EINVAL;
}
@ -623,7 +621,7 @@ dai_node_put:
of_node_put(cpu_dai_node[i]);
}
of_node_put(card->aux_dev[0].codec_of_node);
of_node_put(card->aux_dev[0].dlc.of_node);
return ret;
}