ASoC: Intel: sof_cs42l42: add mtl_cs42l42_def for mtl boards

Add the board config mtl_cs42l42_def to cs42l42 machine driver for all
mtl boards using default SSP port allocation (headphone codec on SSP2,
speaker amplifiers on SSP0, and BT offload on SSP1).

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240327162408.63953-19-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c
index 3fc76184bdb3d3635c1013347aee3e5f30f2e6a8..f4fee2ee0d63b3efdef4978f7210d5fe6ad769d3 100644 (file)
--- a/sound/soc/intel/boards/sof_cs42l42.c
+++ b/sound/soc/intel/boards/sof_cs42l42.c
@@ -278,6 +278,13 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_BT_OFFLOAD_PRESENT |
                                        SOF_SSP_PORT_BT_OFFLOAD(2)),
        },
+       {
+               .name = "mtl_cs42l42_def",
+               .driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(2) |
+                                       SOF_SSP_PORT_AMP(0) |
+                                       SOF_BT_OFFLOAD_PRESENT |
+                                       SOF_SSP_PORT_BT_OFFLOAD(1)),
+       },
        { }
 };
 MODULE_DEVICE_TABLE(platform, board_ids);

diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 7f422848a3ba61bc48e7113e96099f18cc150c36..75935b454e5df8a4746ab2cc649e5e7722629a40 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -69,6 +69,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
        /* place boards for each headphone codec: sof driver will complete the
         * tplg name and machine driver will detect the amp type
         */
+       {
+               .id = CS42L42_ACPI_HID,
+               .drv_name = "mtl_cs42l42_def",
+               .sof_tplg_filename = "sof-mtl", /* the tplg suffix is added at run time */
+               .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
+                                       SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
+       },
        {
                .id = NAU8825_ACPI_HID,
                .drv_name = "mtl_nau8825_def",