Unverified Commit 2e3bc947 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: use .controls/.widgets to add controls/widgets 



sof_sdw_rtd_init() will add the controls and widgets if we set them in
the codec_info. Move the additions from .rtd_init callback to
sof_sdw_rtd_init().

Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240509163418.67746-17-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 70d470f0

sound/soc/intel/boards/sof_sdw.c

+112 −0
Original line number Diff line number Diff line
@@ -515,6 +515,50 @@ static struct snd_soc_dai_link_component platform_component[] = { 
	}

};



static const struct snd_soc_dapm_widget generic_dmic_widgets[] = {

	SND_SOC_DAPM_MIC("DMIC", NULL),

};



static const struct snd_soc_dapm_widget generic_jack_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_kcontrol_new generic_jack_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static const struct snd_soc_dapm_widget generic_spk_widgets[] = {

	SND_SOC_DAPM_SPK("Speaker", NULL),

};



static const struct snd_kcontrol_new generic_spk_controls[] = {

	SOC_DAPM_PIN_SWITCH("Speaker"),

};



static const struct snd_soc_dapm_widget maxim_widgets[] = {

	SND_SOC_DAPM_SPK("Left Spk", NULL),

	SND_SOC_DAPM_SPK("Right Spk", NULL),

};



static const struct snd_kcontrol_new maxim_controls[] = {

	SOC_DAPM_PIN_SWITCH("Left Spk"),

	SOC_DAPM_PIN_SWITCH("Right Spk"),

};



static const struct snd_soc_dapm_widget rt700_widgets[] = {

	SND_SOC_DAPM_HP("Headphones", NULL),

	SND_SOC_DAPM_MIC("AMIC", NULL),

	SND_SOC_DAPM_SPK("Speaker", NULL),

};



static const struct snd_kcontrol_new rt700_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphones"),

	SOC_DAPM_PIN_SWITCH("AMIC"),

	SOC_DAPM_PIN_SWITCH("Speaker"),

};



struct snd_soc_dai *get_codec_dai_by_name(struct snd_soc_pcm_runtime *rtd,

					  const char * const dai_name[],

					  int num_dais)
@@ -681,6 +725,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.rtd_init = rt700_rtd_init,

				.controls = rt700_controls,

				.num_controls = ARRAY_SIZE(rt700_controls),

				.widgets = rt700_widgets,

				.num_widgets = ARRAY_SIZE(rt700_widgets),

			},

		},

		.dai_num = 1,
@@ -697,6 +745,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

		},

		.dai_num = 1,
@@ -713,6 +765,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt711_init,

				.exit = sof_sdw_rt711_exit,

				.rtd_init = rt711_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

		},

		.dai_num = 1,
@@ -729,6 +785,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

			{

				.direction = {true, false},
@@ -738,6 +798,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt712_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

		},

		.dai_num = 2,
@@ -768,6 +832,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

		},

		.dai_num = 1,
@@ -798,6 +866,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

		},

		.dai_num = 1,
@@ -814,6 +886,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

		},

		.dai_num = 1,
@@ -829,6 +905,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

		},

		.dai_num = 1,
@@ -905,6 +985,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

			{

				.direction = {true, false},
@@ -915,6 +999,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt722_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

			{

				.direction = {false, true},
@@ -936,6 +1024,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_maxim_init,

				.rtd_init = maxim_spk_rtd_init,

				.controls = maxim_controls,

				.num_controls = ARRAY_SIZE(maxim_controls),

				.widgets = maxim_widgets,

				.num_widgets = ARRAY_SIZE(maxim_widgets),

			},

		},

		.dai_num = 1,
@@ -950,6 +1042,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.init = sof_sdw_maxim_init,

				.rtd_init = maxim_spk_rtd_init,

				.controls = maxim_controls,

				.num_controls = ARRAY_SIZE(maxim_controls),

				.widgets = maxim_widgets,

				.num_widgets = ARRAY_SIZE(maxim_widgets),

			},

		},

		.dai_num = 1,
@@ -963,6 +1059,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.rtd_init = rt5682_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

		},

		.dai_num = 1,
@@ -977,6 +1077,8 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_cs_amp_init,

				.rtd_init = cs_spk_rtd_init,

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

		},

		.dai_num = 1,
@@ -990,6 +1092,10 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},

				.rtd_init = cs42l42_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

		},

		.dai_num = 1,
@@ -1006,6 +1112,8 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dai_type = SOF_SDW_DAI_TYPE_JACK,

				.dailink = {SDW_JACK_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.rtd_init = cs42l43_hs_rtd_init,

				.widgets = generic_jack_widgets,

				.num_widgets = ARRAY_SIZE(generic_jack_widgets),

			},

			{

				.direction = {false, true},
@@ -1013,6 +1121,8 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dai_type = SOF_SDW_DAI_TYPE_MIC,

				.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},

				.rtd_init = cs42l43_dmic_rtd_init,

				.widgets = generic_dmic_widgets,

				.num_widgets = ARRAY_SIZE(generic_dmic_widgets),

			},

			{

				.direction = {false, true},
@@ -1027,6 +1137,8 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
				.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},

				.init = sof_sdw_cs42l43_spk_init,

				.rtd_init = cs42l43_spk_rtd_init,

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

				.quirk = SOF_CODEC_SPKR | SOF_SIDECAR_AMPS,

			},

		},

sound/soc/intel/boards/sof_sdw_cs42l42.c

+0 −24
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
#include <sound/jack.h>

#include "sof_sdw_common.h"



static const struct snd_soc_dapm_widget generic_jack_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route cs42l42_map[] = {

	/* HP jack connectors - unknown if we have jack detection */

	{"Headphone", NULL, "cs42l42 HP"},
@@ -30,11 +25,6 @@ static const struct snd_soc_dapm_route cs42l42_map[] = { 
	{"cs42l42 HS", NULL, "Headset Mic"},

};



static const struct snd_kcontrol_new generic_jack_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static struct snd_soc_jack_pin cs42l42_jack_pins[] = {

	{

		.pin    = "Headphone",
@@ -70,20 +60,6 @@ int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_add_card_controls(card, generic_jack_controls,

					ARRAY_SIZE(generic_jack_controls));

	if (ret) {

		dev_err(card->dev, "cs42l42 control addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,

					ARRAY_SIZE(generic_jack_widgets));

	if (ret) {

		dev_err(card->dev, "cs42l42 widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, cs42l42_map,

				      ARRAY_SIZE(cs42l42_map));

sound/soc/intel/boards/sof_sdw_cs42l43.c

+0 −34
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 
#include <sound/soc-dapm.h>

#include "sof_sdw_common.h"



static const struct snd_soc_dapm_widget generic_jack_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route cs42l43_hs_map[] = {

	{ "Headphone", NULL, "cs42l43 AMP3_OUT" },

	{ "Headphone", NULL, "cs42l43 AMP4_OUT" },
@@ -30,10 +25,6 @@ static const struct snd_soc_dapm_route cs42l43_hs_map[] = { 
	{ "cs42l43 ADC1_IN1_N", NULL, "Headset Mic" },

};



static const struct snd_soc_dapm_widget generic_spk_widgets[] = {

	SND_SOC_DAPM_SPK("Speaker", NULL),

};



static const struct snd_soc_dapm_route cs42l43_spk_map[] = {

	{ "Speaker", NULL, "cs42l43 AMP1_OUT_P", },

	{ "Speaker", NULL, "cs42l43 AMP1_OUT_N", },
@@ -41,10 +32,6 @@ static const struct snd_soc_dapm_route cs42l43_spk_map[] = { 
	{ "Speaker", NULL, "cs42l43 AMP2_OUT_N", },

};



static const struct snd_soc_dapm_widget generic_dmic_widgets[] = {

	SND_SOC_DAPM_MIC("DMIC", NULL),

};



static const struct snd_soc_dapm_route cs42l43_dmic_map[] = {

	{ "cs42l43 PDM1_DIN", NULL, "DMIC" },

	{ "cs42l43 PDM2_DIN", NULL, "DMIC" },
@@ -74,13 +61,6 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,

					ARRAY_SIZE(generic_jack_widgets));

	if (ret) {

		dev_err(card->dev, "cs42l43 hs widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_hs_map,

				      ARRAY_SIZE(cs42l43_hs_map));

	if (ret) {
@@ -133,13 +113,6 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd) 
			return -ENOMEM;

	}



	ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,

					ARRAY_SIZE(generic_spk_widgets));

	if (ret) {

		dev_err(card->dev, "cs42l43 speaker widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_spk_map,

				      ARRAY_SIZE(cs42l43_spk_map));

	if (ret)
@@ -172,13 +145,6 @@ int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_new_controls(&card->dapm, generic_dmic_widgets,

					ARRAY_SIZE(generic_dmic_widgets));

	if (ret) {

		dev_err(card->dev, "cs42l43 dmic widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_dmic_map,

				      ARRAY_SIZE(cs42l43_dmic_map));

	if (ret)

sound/soc/intel/boards/sof_sdw_cs_amp.c

+0 −11
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 


#define CODEC_NAME_SIZE	8



static const struct snd_soc_dapm_widget generic_spk_widgets[] = {

	SND_SOC_DAPM_SPK("Speaker", NULL),

};



int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	const char *dai_name = rtd->dai_link->codecs->dai_name;
@@ -35,13 +31,6 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,

					ARRAY_SIZE(generic_spk_widgets));

	if (ret) {

		dev_err(card->dev, "widgets addition failed: %d\n", ret);

		return ret;

	}



	for_each_rtd_codec_dais(rtd, i, codec_dai) {

		if (!strstr(codec_dai->name, "cs35l56"))

			continue;

sound/soc/intel/boards/sof_sdw_maxim.c

+0 −24
Original line number Diff line number Diff line
@@ -16,16 +16,6 @@ static int maxim_part_id; 
#define SOF_SDW_PART_ID_MAX98363 0x8363

#define SOF_SDW_PART_ID_MAX98373 0x8373



static const struct snd_soc_dapm_widget maxim_widgets[] = {

	SND_SOC_DAPM_SPK("Left Spk", NULL),

	SND_SOC_DAPM_SPK("Right Spk", NULL),

};



static const struct snd_kcontrol_new maxim_controls[] = {

	SOC_DAPM_PIN_SWITCH("Left Spk"),

	SOC_DAPM_PIN_SWITCH("Right Spk"),

};



static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {

	{ "Left Spk", NULL, "Left BE_OUT" },

	{ "Right Spk", NULL, "Right BE_OUT" },
@@ -45,20 +35,6 @@ int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	dev_dbg(card->dev, "soundwire maxim card components assigned : %s\n",

		card->components);



	ret = snd_soc_add_card_controls(card, maxim_controls,

					ARRAY_SIZE(maxim_controls));

	if (ret) {

		dev_err(card->dev, "mx%04x ctrls addition failed: %d\n", maxim_part_id, ret);

		return ret;

	}



	ret = snd_soc_dapm_new_controls(&card->dapm, maxim_widgets,

					ARRAY_SIZE(maxim_widgets));

	if (ret) {

		dev_err(card->dev, "mx%04x widgets addition failed: %d\n", maxim_part_id, ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, 2);

	if (ret)

		dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);