ASoC: sdw_utils: Add support for exclusion DAI quirks

The system contains a mechanism for certain DAI links to be included
based on a quirk. Add support for certain DAI links to excluded based on
a quirk, this is useful in situations where the vast majority of SKUs
utilise a feature so it is easier to quirk on those that don't.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241016030344.13535-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h
index 2374e6df4e586adb6627fffac8e2f4af8c72d29d..e16fccd48e6bc82970ee4e2fc2985d601a9fad08 100644 (file)
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -59,6 +59,7 @@ struct asoc_sdw_dai_info {
        int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
        bool rtd_init_done; /* Indicate that the rtd_init callback is done */
        unsigned long quirk;
+       bool quirk_exclude;
 };
 
 struct asoc_sdw_codec_info {

diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index a9323cb444d02f6e4e8e53d2964229d699c15c8c..f86d55cdaaf68a2c06c7de0b8faae263fb75e10e 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -1153,7 +1153,8 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
                                dai_info = &codec_info->dais[adr_end->num];
                                soc_dai = asoc_sdw_find_dailink(soc_dais, adr_end);
 
-                               if (dai_info->quirk && !(dai_info->quirk & ctx->mc_quirk))
+                               if (dai_info->quirk &&
+                                   !(dai_info->quirk_exclude ^ !!(dai_info->quirk & ctx->mc_quirk)))
                                        continue;
 
                                dev_dbg(dev,