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

ASoC: intel: rename ignore_pch_dmic variable name 

Rename 'ignore_pch_dmic' variable name as 'ignore_internal_dmic'.
This variable will be moved to common header file and will be used by other
platform machine driver code.

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-7-Vijendar.Mukunda@amd.com


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

sound/soc/intel/boards/sof_sdw.c

+6 −6
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
	{

		.part_id = 0x714,

		.version_id = 3,

		.ignore_pch_dmic = true,

		.ignore_internal_dmic = true,

		.dais = {

			{

				.direction = {false, true},
@@ -947,7 +947,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
	{

		.part_id = 0x715,

		.version_id = 3,

		.ignore_pch_dmic = true,

		.ignore_internal_dmic = true,

		.dais = {

			{

				.direction = {false, true},
@@ -962,7 +962,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
	{

		.part_id = 0x714,

		.version_id = 2,

		.ignore_pch_dmic = true,

		.ignore_internal_dmic = true,

		.dais = {

			{

				.direction = {false, true},
@@ -977,7 +977,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { 
	{

		.part_id = 0x715,

		.version_id = 2,

		.ignore_pch_dmic = true,

		.ignore_internal_dmic = true,

		.dais = {

			{

				.direction = {false, true},
@@ -1542,7 +1542,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, 
			if (!codec_info)

				return -EINVAL;



			ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic;

			ctx->ignore_internal_dmic |= codec_info->ignore_internal_dmic;



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

			if (!codec_name)
@@ -2018,7 +2018,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 


	/* dmic */

	if (dmic_num > 0) {

		if (ctx->ignore_pch_dmic) {

		if (ctx->ignore_internal_dmic) {

			dev_warn(dev, "Ignoring PCH DMIC\n");

		} else {

			ret = create_dmic_dailinks(card, &dai_links, &be_id);

sound/soc/intel/boards/sof_sdw_common.h

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct asoc_sdw_codec_info { 
	const char *codec_name;

	int amp_num;

	const u8 acpi_id[ACPI_ID_LEN];

	const bool ignore_pch_dmic;

	const bool ignore_internal_dmic;

	const struct snd_soc_ops *ops;

	struct asoc_sdw_dai_info dais[SOC_SDW_MAX_DAI_NUM];

	const int dai_num;
@@ -129,7 +129,7 @@ struct mc_private { 
	/* To store SDW Pin index for each SoundWire link */

	unsigned int sdw_pin_index[SDW_MAX_LINKS];

	bool append_dai_type;

	bool ignore_pch_dmic;

	bool ignore_internal_dmic;

};



extern unsigned long sof_sdw_quirk;