ASoC: Intel: sof_sdw: add quirk override with kernel parameter

During the bring-up of new platforms, or to take care of specific
hardware reworks, it's useful to add a kernel parameter to override
the default DMI-based quirks.

For example, adding the following line in a .conf file in
/etc/modprobe.d/ will change the default quirk and log the changes if
dynamic debug is enabled.

options snd_soc_sof_sdw quirk=0x802

[  735.025785] sof_sdw sof_sdw: Overriding quirk 0x10 => 0x802
[  735.025787] sof_sdw sof_sdw: quirk realtek,jack-detect-source 2
[  735.025790] sof_sdw sof_sdw: quirk SOF_RT715_DAI_ID_FIX enabled

Tested on ICL RVP with add-on board instead of default codec.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200625191308.3322-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 1bfd961..70ee79a 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -15,9 +15,32 @@
 #include "sof_sdw_common.h"
 
 unsigned long sof_sdw_quirk = SOF_RT711_JD_SRC_JD1;
+static int quirk_override = -1;
+module_param_named(quirk, quirk_override, int, 0444);
+MODULE_PARM_DESC(quirk, "Board-specific quirk override");
 
 #define INC_ID(BE, CPU, LINK)  do { (BE)++; (CPU)++; (LINK)++; } while (0)
 
+static void log_quirks(struct device *dev)
+{
+       if (SOF_RT711_JDSRC(sof_sdw_quirk))
+               dev_dbg(dev, "quirk realtek,jack-detect-source %ld\n",
+                       SOF_RT711_JDSRC(sof_sdw_quirk));
+       if (sof_sdw_quirk & SOF_SDW_FOUR_SPK)
+               dev_dbg(dev, "quirk SOF_SDW_FOUR_SPK enabled\n");
+       if (sof_sdw_quirk & SOF_SDW_TGL_HDMI)
+               dev_dbg(dev, "quirk SOF_SDW_TGL_HDMI enabled\n");
+       if (sof_sdw_quirk & SOF_SDW_PCH_DMIC)
+               dev_dbg(dev, "quirk SOF_SDW_PCH_DMIC enabled\n");
+       if (SOF_SSP_GET_PORT(sof_sdw_quirk))
+               dev_dbg(dev, "SSP port %ld\n",
+                       SOF_SSP_GET_PORT(sof_sdw_quirk));
+       if (sof_sdw_quirk & SOF_RT715_DAI_ID_FIX)
+               dev_dbg(dev, "quirk SOF_RT715_DAI_ID_FIX enabled\n");
+       if (sof_sdw_quirk & SOF_SDW_NO_AGGREGATION)
+               dev_dbg(dev, "quirk SOF_SDW_NO_AGGREGATION enabled\n");
+}
+
 static int sof_sdw_quirk_cb(const struct dmi_system_id *id)
 {
        sof_sdw_quirk = (unsigned long)id->driver_data;
@@ -915,6 +938,13 @@ static int mc_probe(struct platform_device *pdev)
 
        dmi_check_system(sof_sdw_quirk_table);
 
+       if (quirk_override != -1) {
+               dev_info(&pdev->dev, "Overriding quirk 0x%lx => 0x%x\n",
+                        sof_sdw_quirk, quirk_override);
+               sof_sdw_quirk = quirk_override;
+       }
+       log_quirks(&pdev->dev);
+
        INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
 
        card->dev = &pdev->dev;