niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: mediatek: mt8183-da7219: use hdmi-codec

Browse source 
Adds DAI link to use hdmi-codec.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20200710052505.3664118-6-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tzung-Bi Shih 2020-07-10 13:25:04 +08:00 • committed by Mark Brown
parent 5653841d1e
commit 5bdbe97711
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
View file

@ -354,7 +354,7 @@ SND_SOC_DAILINK_DEFS(i2s5,
SND_SOC_DAILINK_DEFS(tdm, SND_SOC_DAILINK_DEFS(tdm,
DAILINK_COMP_ARRAY(COMP_CPU("TDM")), DAILINK_COMP_ARRAY(COMP_CPU("TDM")),
DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "i2s-hifi")),
DAILINK_COMP_ARRAY(COMP_EMPTY())); DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {
@ -627,7 +627,7 @@ static struct snd_soc_card mt8183_da7219_rt1015_card = {
static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card; struct snd_soc_card *card;
struct device_node *platform_node; struct device_node *platform_node, *hdmi_codec;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct mt8183_da7219_max98357_priv *priv; struct mt8183_da7219_max98357_priv *priv;
struct pinctrl *pinctrl; struct pinctrl *pinctrl;
@ -648,6 +648,9 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
card = (struct snd_soc_card *)match->data; card = (struct snd_soc_card *)match->data;
card->dev = &pdev->dev; card->dev = &pdev->dev;
hdmi_codec = of_parse_phandle(pdev->dev.of_node,
"mediatek,hdmi-codec", 0);
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (strcmp(dai_link->name, "I2S3") == 0) { if (strcmp(dai_link->name, "I2S3") == 0) {
if (card == &mt8183_da7219_max98357_card) { if (card == &mt8183_da7219_max98357_card) {
@ -679,6 +682,9 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
} }
} }
if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0)
dai_link->codecs->of_node = hdmi_codec;
if (!dai_link->platforms->name) if (!dai_link->platforms->name)
dai_link->platforms->of_node = platform_node; dai_link->platforms->of_node = platform_node;
} }