Skip to content

Commit

Permalink
ASoC: Intel: sof_sdw: Move ignore_pch_dmic to new parsing
Browse files Browse the repository at this point in the history
Trivial move of the handling of ignore_pch_dmic over to the new parsing
code.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240326160429.13560-21-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Charles Keepax authored and Mark Brown committed Mar 26, 2024
1 parent 0d7b988 commit 22f2a5e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/soc/intel/boards/sof_sdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1453,6 +1453,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
struct sof_sdw_endpoint *sof_ends)
{
struct device *dev = card->dev;
struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct snd_soc_acpi_mach *mach = dev_get_platdata(dev);
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
struct snd_soc_codec_conf *codec_conf = card->codec_conf;
Expand Down Expand Up @@ -1483,6 +1484,8 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
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);
if (!codec_name)
return -ENOMEM;
Expand Down Expand Up @@ -1630,8 +1633,6 @@ static int create_sdw_dailink(struct snd_soc_card *card,
if (!codec_info)
return -EINVAL;

ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic;

for_each_pcm_streams(stream) {
char *name, *cpu_name;
int playback, capture;
Expand Down

0 comments on commit 22f2a5e

Please sign in to comment.