| From 7836adf61a78e911de12486d244c431c40d91fa0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Feb 2021 17:33:30 -0600 |
| Subject: ASoC: Intel: sof_sdw: detect DMIC number based on mach params |
| |
| From: Rander Wang <rander.wang@intel.com> |
| |
| [ Upstream commit f88dcb9b98d3f86ead04d2453475267910448bb8 ] |
| |
| Current driver create DMIC dai based on quirk for each platforms, |
| so we need to add quirk for new platforms. Now driver reports DMIC |
| number to machine driver and machine driver can create DMIC dai based |
| on this information. The old check is reserved for some platforms |
| may be failed to set the DMIC number in BIOS. |
| |
| Reviewed-by: Bard Liao <bard.liao@intel.com> |
| Signed-off-by: Rander Wang <rander.wang@intel.com> |
| Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| Link: https://lore.kernel.org/r/20210208233336.59449-6-pierre-louis.bossart@linux.intel.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/intel/boards/sof_sdw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c |
| index c64c0d5c5751..daca06dde99b 100644 |
| --- a/sound/soc/intel/boards/sof_sdw.c |
| +++ b/sound/soc/intel/boards/sof_sdw.c |
| @@ -936,7 +936,7 @@ static int sof_card_dai_links_create(struct device *dev, |
| ctx->idisp_codec = true; |
| |
| /* enable dmic01 & dmic16k */ |
| - dmic_num = (sof_sdw_quirk & SOF_SDW_PCH_DMIC) ? 2 : 0; |
| + dmic_num = (sof_sdw_quirk & SOF_SDW_PCH_DMIC || mach_params->dmic_num) ? 2 : 0; |
| comp_num += dmic_num; |
| |
| dev_dbg(dev, "sdw %d, ssp %d, dmic %d, hdmi %d", sdw_be_num, ssp_num, |
| -- |
| 2.30.1 |
| |
