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

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: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-7-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Vijendar Mukunda and committed by
Mark Brown
b1f7cbf0 a2b5ec0c

+8 -8
+6 -6
sound/soc/intel/boards/sof_sdw.c
··· 932 932 { 933 933 .part_id = 0x714, 934 934 .version_id = 3, 935 - .ignore_pch_dmic = true, 935 + .ignore_internal_dmic = true, 936 936 .dais = { 937 937 { 938 938 .direction = {false, true}, ··· 947 947 { 948 948 .part_id = 0x715, 949 949 .version_id = 3, 950 - .ignore_pch_dmic = true, 950 + .ignore_internal_dmic = true, 951 951 .dais = { 952 952 { 953 953 .direction = {false, true}, ··· 962 962 { 963 963 .part_id = 0x714, 964 964 .version_id = 2, 965 - .ignore_pch_dmic = true, 965 + .ignore_internal_dmic = true, 966 966 .dais = { 967 967 { 968 968 .direction = {false, true}, ··· 977 977 { 978 978 .part_id = 0x715, 979 979 .version_id = 2, 980 - .ignore_pch_dmic = true, 980 + .ignore_internal_dmic = true, 981 981 .dais = { 982 982 { 983 983 .direction = {false, true}, ··· 1542 1542 if (!codec_info) 1543 1543 return -EINVAL; 1544 1544 1545 - ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic; 1545 + ctx->ignore_internal_dmic |= codec_info->ignore_internal_dmic; 1546 1546 1547 1547 codec_name = asoc_sdw_get_codec_name(dev, codec_info, adr_link, i); 1548 1548 if (!codec_name) ··· 2018 2018 2019 2019 /* dmic */ 2020 2020 if (dmic_num > 0) { 2021 - if (ctx->ignore_pch_dmic) { 2021 + if (ctx->ignore_internal_dmic) { 2022 2022 dev_warn(dev, "Ignoring PCH DMIC\n"); 2023 2023 } else { 2024 2024 ret = create_dmic_dailinks(card, &dai_links, &be_id);
+2 -2
sound/soc/intel/boards/sof_sdw_common.h
··· 106 106 const char *codec_name; 107 107 int amp_num; 108 108 const u8 acpi_id[ACPI_ID_LEN]; 109 - const bool ignore_pch_dmic; 109 + const bool ignore_internal_dmic; 110 110 const struct snd_soc_ops *ops; 111 111 struct asoc_sdw_dai_info dais[SOC_SDW_MAX_DAI_NUM]; 112 112 const int dai_num; ··· 129 129 /* To store SDW Pin index for each SoundWire link */ 130 130 unsigned int sdw_pin_index[SDW_MAX_LINKS]; 131 131 bool append_dai_type; 132 - bool ignore_pch_dmic; 132 + bool ignore_internal_dmic; 133 133 }; 134 134 135 135 extern unsigned long sof_sdw_quirk;