Skip to content

Commit 70d470f

Browse files
bardliaobroonie
authored andcommitted
ASoC: Intel: sof_sdw: add controls and dapm widgets in codec_info
Currently, we add card controls and dapm widgets one by one in the codec_info->dais->rtd_init callback. Duplicated controls and dapm widgets will be added if there are more than one types of amps in the dai link. Moving it to sof_sdw_rtd_init() and only add the controls/widgets of the first codec dai can avoid the duplications. Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20240509163418.67746-16-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 01c266a commit 70d470f

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

sound/soc/intel/boards/sof_sdw.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,7 @@ static const char *get_codec_name(struct device *dev,
12481248

12491249
static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
12501250
{
1251+
struct snd_soc_card *card = rtd->card;
12511252
struct sof_sdw_codec_info *codec_info;
12521253
struct snd_soc_dai *dai;
12531254
int dai_index;
@@ -1267,6 +1268,36 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
12671268
*/
12681269
if (codec_info->dais[dai_index].rtd_init_done)
12691270
continue;
1271+
1272+
/*
1273+
* Add card controls and dapm widgets for the first codec dai.
1274+
* The controls and widgets will be used for all codec dais.
1275+
*/
1276+
1277+
if (i > 0)
1278+
goto skip_add_controls_widgets;
1279+
1280+
if (codec_info->dais[dai_index].controls) {
1281+
ret = snd_soc_add_card_controls(card, codec_info->dais[dai_index].controls,
1282+
codec_info->dais[dai_index].num_controls);
1283+
if (ret) {
1284+
dev_err(card->dev, "%#x controls addition failed: %d\n",
1285+
codec_info->part_id, ret);
1286+
return ret;
1287+
}
1288+
}
1289+
if (codec_info->dais[dai_index].widgets) {
1290+
ret = snd_soc_dapm_new_controls(&card->dapm,
1291+
codec_info->dais[dai_index].widgets,
1292+
codec_info->dais[dai_index].num_widgets);
1293+
if (ret) {
1294+
dev_err(card->dev, "%#x widgets addition failed: %d\n",
1295+
codec_info->part_id, ret);
1296+
return ret;
1297+
}
1298+
}
1299+
1300+
skip_add_controls_widgets:
12701301
if (codec_info->dais[dai_index].rtd_init) {
12711302
ret = codec_info->dais[dai_index].rtd_init(rtd);
12721303
if (ret)

sound/soc/intel/boards/sof_sdw_common.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ struct sof_sdw_dai_info {
8686
const char *dai_name;
8787
const int dai_type;
8888
const int dailink[2]; /* dailink id for each direction */
89+
const struct snd_kcontrol_new *controls;
90+
const int num_controls;
91+
const struct snd_soc_dapm_widget *widgets;
92+
const int num_widgets;
8993
int (*init)(struct snd_soc_card *card,
9094
struct snd_soc_dai_link *dai_links,
9195
struct sof_sdw_codec_info *info,

0 commit comments

Comments
 (0)