ASoC: SOF: Intel: sdw: relax sdw machine select constraints

On some platforms such as Up Extreme all links are enabled but only one
link can be used by external codec. Instead of exact match of two masks,
first check whether link_mask of mach is subset of link_mask supported
by hw and then go on searching link_adr.

Signed-off-by: randerwang <rander.wang@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20200515135958.17511-6-kai.vehmanen@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 578ac7b036b01ae8b7343a40ccc3fccd1bb5854f..63ca920c8e6e04940038f0839ce84f223e47cab6 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1107,7 +1107,15 @@ static int hda_sdw_machine_select(struct snd_sof_dev *sdev)
        if (link_mask && !pdata->machine) {
                for (mach = pdata->desc->alt_machines;
                     mach && mach->link_mask; mach++) {
-                       if (mach->link_mask != link_mask)
+                       /*
+                        * On some platforms such as Up Extreme all links
+                        * are enabled but only one link can be used by
+                        * external codec. Instead of exact match of two masks,
+                        * first check whether link_mask of mach is subset of
+                        * link_mask supported by hw and then go on searching
+                        * link_adr
+                        */
+                       if (~link_mask & mach->link_mask)
                                continue;
 
                        /* No need to match adr if there is no links defined */