mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
ASoC: mediatek: mt8192: refactor for I2S8/I2S9 DAI links of headset
As part of the refactoring to allow the same machine driver to be used for the rt1015(p) and rt5682(s) codecs on the MT8192 platform, parse the rt5682(s) codec from the headset-codec property in the devicetree and wire it to the I2S8 and I2S9 backends. Signed-off-by: Jiaxin Yu <jiaxin.yu@mediatek.com> Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20220408060552.26607-4-jiaxin.yu@mediatek.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
e1e408e60e
commit
f8910fb498
1 changed files with 26 additions and 8 deletions
|
@ -28,9 +28,6 @@
|
|||
#define RT1015_DEV0_NAME "rt1015.1-0028"
|
||||
#define RT1015_DEV1_NAME "rt1015.1-0029"
|
||||
|
||||
#define RT5682_CODEC_DAI "rt5682-aif1"
|
||||
#define RT5682_DEV0_NAME "rt5682.1-001a"
|
||||
|
||||
struct mt8192_mt6359_priv {
|
||||
struct snd_soc_jack headset_jack;
|
||||
struct snd_soc_jack hdmi_jack;
|
||||
|
@ -626,14 +623,12 @@ SND_SOC_DAILINK_DEFS(i2s7,
|
|||
|
||||
SND_SOC_DAILINK_DEFS(i2s8,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("I2S8")),
|
||||
DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME,
|
||||
RT5682_CODEC_DAI)),
|
||||
DAILINK_COMP_ARRAY(COMP_EMPTY()),
|
||||
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
||||
|
||||
SND_SOC_DAILINK_DEFS(i2s9,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("I2S9")),
|
||||
DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME,
|
||||
RT5682_CODEC_DAI)),
|
||||
DAILINK_COMP_ARRAY(COMP_EMPTY()),
|
||||
DAILINK_COMP_ARRAY(COMP_EMPTY()));
|
||||
|
||||
SND_SOC_DAILINK_DEFS(connsys_i2s,
|
||||
|
@ -1114,7 +1109,7 @@ static int mt8192_mt6359_card_set_be_link(struct snd_soc_card *card,
|
|||
static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card;
|
||||
struct device_node *platform_node, *hdmi_codec, *speaker_codec;
|
||||
struct device_node *platform_node, *hdmi_codec, *headset_codec, *speaker_codec;
|
||||
int ret, i;
|
||||
struct snd_soc_dai_link *dai_link;
|
||||
struct mt8192_mt6359_priv *priv;
|
||||
|
@ -1142,6 +1137,13 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
|
|||
goto err_speaker_codec;
|
||||
}
|
||||
|
||||
headset_codec = of_get_child_by_name(pdev->dev.of_node, "headset-codec");
|
||||
if (!headset_codec) {
|
||||
ret = -EINVAL;
|
||||
dev_err_probe(&pdev->dev, ret, "Property 'headset-codec' missing or invalid\n");
|
||||
goto err_headset_codec;
|
||||
}
|
||||
|
||||
for_each_card_prelinks(card, i, dai_link) {
|
||||
ret = mt8192_mt6359_card_set_be_link(card, dai_link, speaker_codec, "I2S3");
|
||||
if (ret) {
|
||||
|
@ -1150,6 +1152,20 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
|
|||
goto err_probe;
|
||||
}
|
||||
|
||||
ret = mt8192_mt6359_card_set_be_link(card, dai_link, headset_codec, "I2S8");
|
||||
if (ret) {
|
||||
dev_err_probe(&pdev->dev, ret, "%s set headset_codec fail\n",
|
||||
dai_link->name);
|
||||
goto err_probe;
|
||||
}
|
||||
|
||||
ret = mt8192_mt6359_card_set_be_link(card, dai_link, headset_codec, "I2S9");
|
||||
if (ret) {
|
||||
dev_err_probe(&pdev->dev, ret, "%s set headset_codec fail\n",
|
||||
dai_link->name);
|
||||
goto err_probe;
|
||||
}
|
||||
|
||||
if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {
|
||||
dai_link->codecs->of_node = hdmi_codec;
|
||||
dai_link->ignore = 0;
|
||||
|
@ -1180,6 +1196,8 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
|
|||
dev_err_probe(&pdev->dev, ret, "%s snd_soc_register_card fail\n", __func__);
|
||||
|
||||
err_probe:
|
||||
of_node_put(headset_codec);
|
||||
err_headset_codec:
|
||||
of_node_put(speaker_codec);
|
||||
err_speaker_codec:
|
||||
of_node_put(platform_node);
|
||||
|
|
Loading…
Reference in a new issue