Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: mediatek: mt8186: support rt5682s_max98360

Add support for using the rt5682s codec together with max98360a on
MT8186-MT6366-RT1019-RT5682S machines.

Signed-off-by: tongjian <tongjian@huaqin.corp-partner.google.com>
Link: https://lore.kernel.org/r/20221228122230.3818533-2-tongjian@huaqin.corp-partner.google.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

tongjian and committed by
Mark Brown
6e1dbf69 b1e9c223

+21 -1
+21 -1
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
··· 1083 1083 .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), 1084 1084 }; 1085 1085 1086 + static struct snd_soc_card mt8186_mt6366_rt5682s_max98360_soc_card = { 1087 + .name = "mt8186_rt5682s_max98360", 1088 + .owner = THIS_MODULE, 1089 + .dai_link = mt8186_mt6366_rt1019_rt5682s_dai_links, 1090 + .num_links = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_dai_links), 1091 + .controls = mt8186_mt6366_rt1019_rt5682s_controls, 1092 + .num_controls = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_controls), 1093 + .dapm_widgets = mt8186_mt6366_rt1019_rt5682s_widgets, 1094 + .num_dapm_widgets = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_widgets), 1095 + .dapm_routes = mt8186_mt6366_rt1019_rt5682s_routes, 1096 + .num_dapm_routes = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_routes), 1097 + .codec_conf = mt8186_mt6366_rt1019_rt5682s_codec_conf, 1098 + .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), 1099 + }; 1100 + 1086 1101 static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) 1087 1102 { 1088 1103 struct snd_soc_card *card; ··· 1247 1232 1248 1233 #if IS_ENABLED(CONFIG_OF) 1249 1234 static const struct of_device_id mt8186_mt6366_rt1019_rt5682s_dt_match[] = { 1250 - { .compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound", 1235 + { 1236 + .compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound", 1251 1237 .data = &mt8186_mt6366_rt1019_rt5682s_soc_card, 1238 + }, 1239 + { 1240 + .compatible = "mediatek,mt8186-mt6366-rt5682s-max98360-sound", 1241 + .data = &mt8186_mt6366_rt5682s_max98360_soc_card, 1252 1242 }, 1253 1243 {} 1254 1244 };