Commit 12474919 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/87lfw46w9g.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2d946aaa
...@@ -307,7 +307,6 @@ static struct snd_soc_aux_dev tm2_speaker_amp_dev; ...@@ -307,7 +307,6 @@ static struct snd_soc_aux_dev tm2_speaker_amp_dev;
static int tm2_late_probe(struct snd_soc_card *card) static int tm2_late_probe(struct snd_soc_card *card)
{ {
struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(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 }; unsigned int ch_map[] = { 0, 1 };
struct snd_soc_dai *amp_pdm_dai; struct snd_soc_dai *amp_pdm_dai;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
...@@ -334,8 +333,7 @@ static int tm2_late_probe(struct snd_soc_card *card) ...@@ -334,8 +333,7 @@ static int tm2_late_probe(struct snd_soc_card *card)
return ret; return ret;
} }
dlc.of_node = tm2_speaker_amp_dev.codec_of_node; amp_pdm_dai = snd_soc_find_dai(&tm2_speaker_amp_dev.dlc);
amp_pdm_dai = snd_soc_find_dai(&dlc);
if (!amp_pdm_dai) if (!amp_pdm_dai)
return -ENODEV; return -ENODEV;
...@@ -532,9 +530,9 @@ static int tm2_probe(struct platform_device *pdev) ...@@ -532,9 +530,9 @@ static int tm2_probe(struct platform_device *pdev)
return ret; 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); "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"); dev_err(dev, "audio-amplifier property invalid or missing\n");
return -EINVAL; return -EINVAL;
} }
...@@ -623,7 +621,7 @@ static int tm2_probe(struct platform_device *pdev) ...@@ -623,7 +621,7 @@ static int tm2_probe(struct platform_device *pdev)
of_node_put(cpu_dai_node[i]); 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; return 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