ASoC: Intel: sof_da7219: add mtl_da7219_def for mtl boards

Add the board config mtl_da7219_def to da7219 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://lore.kernel.org/r/20240411220347.131267-9-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_da7219.c b/sound/soc/intel/boards/sof_da7219.c
index fd3a7be993c193926116844ab1f34029e1359879..cbbce07ec5f721b7cbf0989b16596a27d6865039 100644 (file)
--- a/sound/soc/intel/boards/sof_da7219.c
+++ b/sound/soc/intel/boards/sof_da7219.c
@@ -398,6 +398,14 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_SSP_PORT_BT_OFFLOAD(2) |
                                        SOF_BT_OFFLOAD_PRESENT),
        },
+       {
+               .name = "mtl_da7219_def",
+               .driver_data = (kernel_ulong_t)(SOF_DA7219_MCLK_EN |
+                                       SOF_SSP_PORT_CODEC(2) |
+                                       SOF_SSP_PORT_AMP(0) |
+                                       SOF_SSP_PORT_BT_OFFLOAD(1) |
+                                       SOF_BT_OFFLOAD_PRESENT),
+       },
        { }
 };
 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 264f5c19af56f1af74fce9267619ea1205d1bedf..f95490a16b551217b22e1de8ef348a98084a6b70 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -76,6 +76,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
                .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
                                        SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
        },
+       {
+               .id = DA7219_ACPI_HID,
+               .drv_name = "mtl_da7219_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",