ASoC: SOF: Intel: enable dmic handling with 2 or fewer SoundWire links

When PCH-attached DMICs are used on a SoundWire-based platform, all
known devices pin-mux SoundWire link2 and link3 with DMIC, and only
use link0 and link1 for SoundWire.

The HP Omen16 is the first exception to the rule, with SoundWire using
link0 and link3. Rather than using a fixed mask, let's count the
number of SoundWire links used.

BugLink: https://github.com/thesofproject/sof/issues/5966
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220715144144.274770-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index b7fa95e..be3c4f1 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1406,12 +1406,12 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
 
                        /*
                         * DMICs use up to 4 pins and are typically pin-muxed with SoundWire
-                        * link 2 and 3, thus we only try to enable dmics if all conditions
-                        * are true:
-                        * a) link 2 and 3 are not used by SoundWire
+                        * link 2 and 3, or link 1 and 2, thus we only try to enable dmics
+                        * if all conditions are true:
+                        * a) 2 or fewer links are used by SoundWire
                         * b) the NHLT table reports the presence of microphones
                         */
-                       if (!(mach->link_mask & GENMASK(3, 2))) {
+                       if (hweight_long(mach->link_mask) <= 2) {
                                const char *tplg_filename = mach->sof_tplg_filename;
                                int ret;