UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: mediatek: mt8183: make headset codec optional 

Make headset codec optional because some variant machines may not
have an audio jack.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20190716032417.19015-1-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tzung-Bi Shih 2019-07-16 11:24:17 +08:00 committed by Mark Brown
parent af62a3c8a8
commit a962a809e5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
View File

@ -352,8 +352,6 @@ static struct snd_soc_card mt8183_mt6358_ts3a227_max98357_card = {
.owner = THIS_MODULE,
.dai_link = mt8183_mt6358_ts3a227_max98357_dai_links,
.num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_dai_links),
.aux_dev = &mt8183_mt6358_ts3a227_max98357_headset_dev,
.num_aux_devs = 1,
};
static int
@ -404,10 +402,9 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)
mt8183_mt6358_ts3a227_max98357_headset_dev.codec_of_node =
of_parse_phandle(pdev->dev.of_node,
"mediatek,headset-codec", 0);
if (!mt8183_mt6358_ts3a227_max98357_headset_dev.codec_of_node) {
dev_err(&pdev->dev,
"Property 'mediatek,headset-codec' missing/invalid\n");
return -EINVAL;
if (mt8183_mt6358_ts3a227_max98357_headset_dev.codec_of_node) {
card->aux_dev = &mt8183_mt6358_ts3a227_max98357_headset_dev;
card->num_aux_devs = 1;
}
default_pins =