Unverified Commit bd5838c8 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel: rename soundwire codec helper functions 

Rename SoundWire codec helper functions with "asoc_sdw" tag.

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-5-Vijendar.Mukunda@amd.com


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

sound/soc/intel/boards/bridge_cs35l56.c

+9 −9
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static const struct snd_soc_dai_link bridge_dai_template = { 
	SND_SOC_DAILINK_REG(bridge_dai),

};



int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

					  int *num_dais, int *num_devs)

{

	if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {
@@ -106,7 +106,7 @@ int bridge_cs35l56_count_sidecar(struct snd_soc_card *card, 
	return 0;

}



int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

					struct snd_soc_dai_link **dai_links,

					struct snd_soc_codec_conf **codec_conf)

{
@@ -125,7 +125,7 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, 
	return 0;

}



int bridge_cs35l56_spk_init(struct snd_soc_card *card,

int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,

				     struct snd_soc_dai_link *dai_links,

				     struct asoc_sdw_codec_info *info,

				     bool playback)

sound/soc/intel/boards/sof_sdw.c

+77 −77
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt700-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.rtd_init = rt700_rtd_init,

				.rtd_init = asoc_sdw_rt700_rtd_init,

				.controls = rt700_controls,

				.num_controls = ARRAY_SIZE(rt700_controls),

				.widgets = rt700_widgets,
@@ -758,9 +758,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt711-sdca-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.init = asoc_sdw_rt_sdca_jack_init,

				.exit = asoc_sdw_rt_sdca_jack_exit,

				.rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -778,9 +778,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt711-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt711_init,

				.exit = sof_sdw_rt711_exit,

				.rtd_init = rt711_rtd_init,

				.init = asoc_sdw_rt711_init,

				.exit = asoc_sdw_rt711_exit,

				.rtd_init = asoc_sdw_rt711_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -798,9 +798,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt712-sdca-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.init = asoc_sdw_rt_sdca_jack_init,

				.exit = asoc_sdw_rt_sdca_jack_exit,

				.rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -811,9 +811,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt712-sdca-aif2",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt712_spk_rtd_init,

				.init = asoc_sdw_rt_amp_init,

				.exit = asoc_sdw_rt_amp_exit,

				.rtd_init = asoc_sdw_rt712_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -831,7 +831,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt712-sdca-dmic-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 1,
@@ -845,9 +845,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt712-sdca-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.init = asoc_sdw_rt_sdca_jack_init,

				.exit = asoc_sdw_rt_sdca_jack_exit,

				.rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -865,7 +865,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt712-sdca-dmic-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 1,
@@ -879,9 +879,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt1308-aif",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,

				.init = asoc_sdw_rt_amp_init,

				.exit = asoc_sdw_rt_amp_exit,

				.rtd_init = asoc_sdw_rt_amp_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -889,7 +889,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
			},

		},

		.dai_num = 1,

		.ops = &sof_sdw_rt1308_i2s_ops,

		.ops = &soc_sdw_rt1308_i2s_ops,

	},

	{

		.part_id = 0x1316,
@@ -899,9 +899,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt1316-aif",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,

				.init = asoc_sdw_rt_amp_init,

				.exit = asoc_sdw_rt_amp_exit,

				.rtd_init = asoc_sdw_rt_amp_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -918,9 +918,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt1318-aif",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt_amp_spk_rtd_init,

				.init = asoc_sdw_rt_amp_init,

				.exit = asoc_sdw_rt_amp_exit,

				.rtd_init = asoc_sdw_rt_amp_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -939,7 +939,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt715-sdca-aif2",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 1,
@@ -954,7 +954,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt715-sdca-aif2",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 1,
@@ -969,7 +969,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt715-aif2",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 1,
@@ -984,7 +984,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt715-aif2",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 1,
@@ -998,9 +998,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt722-sdca-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.init = sof_sdw_rt_sdca_jack_init,

				.exit = sof_sdw_rt_sdca_jack_exit,

				.rtd_init = rt_sdca_jack_rtd_init,

				.init = asoc_sdw_rt_sdca_jack_init,

				.exit = asoc_sdw_rt_sdca_jack_exit,

				.rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -1012,9 +1012,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				/* No feedback capability is provided by rt722-sdca codec driver*/

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_rt_amp_init,

				.exit = sof_sdw_rt_amp_exit,

				.rtd_init = rt722_spk_rtd_init,

				.init = asoc_sdw_rt_amp_init,

				.exit = asoc_sdw_rt_amp_exit,

				.rtd_init = asoc_sdw_rt722_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -1025,7 +1025,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt722-sdca-aif3",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = rt_dmic_rtd_init,

				.rtd_init = asoc_sdw_rt_dmic_rtd_init,

			},

		},

		.dai_num = 3,
@@ -1038,8 +1038,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "max98373-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_maxim_init,

				.rtd_init = maxim_spk_rtd_init,

				.init = asoc_sdw_maxim_init,

				.rtd_init = asoc_sdw_maxim_spk_rtd_init,

				.controls = maxim_controls,

				.num_controls = ARRAY_SIZE(maxim_controls),

				.widgets = maxim_widgets,
@@ -1056,8 +1056,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "max98363-aif1",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_maxim_init,

				.rtd_init = maxim_spk_rtd_init,

				.init = asoc_sdw_maxim_init,

				.rtd_init = asoc_sdw_maxim_spk_rtd_init,

				.controls = maxim_controls,

				.num_controls = ARRAY_SIZE(maxim_controls),

				.widgets = maxim_widgets,
@@ -1074,7 +1074,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "rt5682-sdw",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.rtd_init = rt5682_rtd_init,

				.rtd_init = asoc_sdw_rt5682_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -1091,8 +1091,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "cs35l56-sdw1",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = sof_sdw_cs_amp_init,

				.rtd_init = cs_spk_rtd_init,

				.init = asoc_sdw_cs_amp_init,

				.rtd_init = asoc_sdw_cs_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -1109,7 +1109,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "cs42l42-sdw",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},

				.rtd_init = cs42l42_rtd_init,

				.rtd_init = asoc_sdw_cs42l42_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -1121,15 +1121,15 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
	{

		.part_id = 0x4243,

		.codec_name = "cs42l43-codec",

		.count_sidecar = bridge_cs35l56_count_sidecar,

		.add_sidecar = bridge_cs35l56_add_sidecar,

		.count_sidecar = asoc_sdw_bridge_cs35l56_count_sidecar,

		.add_sidecar = asoc_sdw_bridge_cs35l56_add_sidecar,

		.dais = {

			{

				.direction = {true, false},

				.dai_name = "cs42l43-dp5",

				.dai_type = SOC_SDW_DAI_TYPE_JACK,

				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.rtd_init = cs42l43_hs_rtd_init,

				.rtd_init = asoc_sdw_cs42l43_hs_rtd_init,

				.controls = generic_jack_controls,

				.num_controls = ARRAY_SIZE(generic_jack_controls),

				.widgets = generic_jack_widgets,
@@ -1140,7 +1140,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "cs42l43-dp1",

				.dai_type = SOC_SDW_DAI_TYPE_MIC,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},

				.rtd_init = cs42l43_dmic_rtd_init,

				.rtd_init = asoc_sdw_cs42l43_dmic_rtd_init,

				.widgets = generic_dmic_widgets,

				.num_widgets = ARRAY_SIZE(generic_dmic_widgets),

			},
@@ -1155,8 +1155,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
				.dai_name = "cs42l43-dp6",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = sof_sdw_cs42l43_spk_init,

				.rtd_init = cs42l43_spk_rtd_init,

				.init = asoc_sdw_cs42l43_spk_init,

				.rtd_init = asoc_sdw_cs42l43_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,
@@ -1220,7 +1220,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
	},

};



static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr)

static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_part(const u64 adr)

{

	unsigned int part_id, sdw_version;

	int i;
@@ -1241,7 +1241,7 @@ static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr) 


}



static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)

static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_acpi(const u8 *acpi_id)

{

	int i;
@@ -1255,7 +1255,7 @@ static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id) 
	return NULL;

}



static struct asoc_sdw_codec_info *find_codec_info_dai(const char *dai_name,

static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_dai(const char *dai_name,

								int *dai_index)

{

	int i, j;
@@ -1320,7 +1320,7 @@ static int init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai 
	return 0;

}



static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,

static bool asoc_sdw_is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,

				      unsigned int sdw_version,

				      unsigned int mfg_id,

				      unsigned int part_id,
@@ -1354,7 +1354,7 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link, 
	return true;

}



static const char *get_codec_name(struct device *dev,

static const char *asoc_sdw_get_codec_name(struct device *dev,

					   const struct asoc_sdw_codec_info *codec_info,

					   const struct snd_soc_acpi_link_adr *adr_link,

					   int adr_index)
@@ -1369,7 +1369,7 @@ static const char *get_codec_name(struct device *dev, 


	if (codec_info->codec_name)

		return devm_kstrdup(dev, codec_info->codec_name, GFP_KERNEL);

	else if (is_unique_device(adr_link, sdw_version, mfg_id, part_id,

	else if (asoc_sdw_is_unique_device(adr_link, sdw_version, mfg_id, part_id,

					   class_id, adr_index))

		return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x",

				      link_id, mfg_id, part_id, class_id);
@@ -1380,7 +1380,7 @@ static const char *get_codec_name(struct device *dev, 
	return NULL;

}



static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)

static int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct asoc_sdw_codec_info *codec_info;
@@ -1390,7 +1390,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	int i;



	for_each_rtd_codec_dais(rtd, i, dai) {

		codec_info = find_codec_info_dai(dai->name, &dai_index);

		codec_info = asoc_sdw_find_codec_info_dai(dai->name, &dai_index);

		if (!codec_info)

			return -EINVAL;
@@ -1538,13 +1538,13 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, 
				return -EINVAL;

			}



			codec_info = find_codec_info_part(adr_dev->adr);

			codec_info = asoc_sdw_find_codec_info_part(adr_dev->adr);

			if (!codec_info)

				return -EINVAL;



			ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic;



			codec_name = get_codec_name(dev, codec_info, adr_link, i);

			codec_name = asoc_sdw_get_codec_name(dev, codec_info, adr_link, i);

			if (!codec_name)

				return -ENOMEM;
@@ -1736,7 +1736,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 


		init_dai_link(dev, *dai_links, be_id, name, playback, capture,

			      cpus, num_cpus, codecs, num_codecs,

			      sof_sdw_rtd_init, &sdw_ops);

			      asoc_sdw_rtd_init, &sdw_ops);



		/*

		 * SoundWire DAILINKs use 'stream' functions and Bank Switch operations
@@ -1831,7 +1831,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card, 
	ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic01",

				   0, 1, // DMIC only supports capture

				   "DMIC01 Pin", "dmic-codec", "dmic-hifi",

				   sof_sdw_dmic_init, NULL);

				   asoc_sdw_dmic_init, NULL);

	if (ret)

		return ret;
@@ -1840,7 +1840,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card, 
	ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic16k",

				   0, 1, // DMIC only supports capture

				   "DMIC16k Pin", "dmic-codec", "dmic-hifi",

				   /* don't call sof_sdw_dmic_init() twice */

				   /* don't call asoc_sdw_dmic_init() twice */

				   NULL, NULL);

	if (ret)

		return ret;
@@ -1956,7 +1956,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
	 * system only when I2S mode is supported, not sdw mode.

	 * Here check ACPI ID to confirm I2S is supported.

	 */

	ssp_info = find_codec_info_acpi(mach->id);

	ssp_info = asoc_sdw_find_codec_info_acpi(mach->id);

	if (ssp_info) {

		ssp_mask = SOF_SSP_GET_PORT(sof_sdw_quirk);

		ssp_num = hweight_long(ssp_mask);

sound/soc/intel/boards/sof_sdw_common.h

+52 −52
Original line number Diff line number Diff line
@@ -148,75 +148,75 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd); 
int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);



/* DMIC support */

int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);

int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);



/* RT711 support */

int sof_sdw_rt711_init(struct snd_soc_card *card,

int asoc_sdw_rt711_init(struct snd_soc_card *card,

			struct snd_soc_dai_link *dai_links,

			struct asoc_sdw_codec_info *info,

			bool playback);

int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT711-SDCA support */

int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,

int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,

			       struct snd_soc_dai_link *dai_links,

			       struct asoc_sdw_codec_info *info,

			       bool playback);

int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT1308 I2S support */

extern const struct snd_soc_ops sof_sdw_rt1308_i2s_ops;

extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;



/* generic amp support */

int sof_sdw_rt_amp_init(struct snd_soc_card *card,

int asoc_sdw_rt_amp_init(struct snd_soc_card *card,

			 struct snd_soc_dai_link *dai_links,

			 struct asoc_sdw_codec_info *info,

			 bool playback);

int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* MAXIM codec support */

int sof_sdw_maxim_init(struct snd_soc_card *card,

int asoc_sdw_maxim_init(struct snd_soc_card *card,

			struct snd_soc_dai_link *dai_links,

			struct asoc_sdw_codec_info *info,

			bool playback);



/* CS42L43 support */

int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,

int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,

			      struct snd_soc_dai_link *dai_links,

			      struct asoc_sdw_codec_info *info,

			      bool playback);



/* CS AMP support */

int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,

					  int *num_dais, int *num_devs);

int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,

					struct snd_soc_dai_link **dai_links,

					struct snd_soc_codec_conf **codec_conf);

int bridge_cs35l56_spk_init(struct snd_soc_card *card,

int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,

				     struct snd_soc_dai_link *dai_links,

				     struct asoc_sdw_codec_info *info,

				     bool playback);



int sof_sdw_cs_amp_init(struct snd_soc_card *card,

int asoc_sdw_cs_amp_init(struct snd_soc_card *card,

			 struct snd_soc_dai_link *dai_links,

			 struct asoc_sdw_codec_info *info,

			 bool playback);



/* dai_link init callbacks */



int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);



#endif

sound/soc/intel/boards/sof_sdw_cs42l42.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static struct snd_soc_jack_pin cs42l42_jack_pins[] = { 
	},

};



int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	struct mc_private *ctx = snd_soc_card_get_drvdata(card);

sound/soc/intel/boards/sof_sdw_cs42l43.c

+8 −8
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct snd_soc_jack_pin sof_jack_pins[] = { 
	},

};



int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;

	struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card);
@@ -99,7 +99,7 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai 
	return ret;

}



int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	int ret;
@@ -121,7 +121,7 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da 
	return ret;

}



int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,

int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,

			      struct snd_soc_dai_link *dai_links,

			      struct asoc_sdw_codec_info *info,

			      bool playback)
@@ -132,10 +132,10 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, 


	info->amp_num++;



	return bridge_cs35l56_spk_init(card, dai_links, info, playback);

	return asoc_sdw_bridge_cs35l56_spk_init(card, dai_links, info, playback);

}



int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	int ret;