ASoC: Intel: sof_da7219: board id cleanup for jsl boards

Introduce "jsl_da7219_def" board to reduce the number of jsl board
configs. This config could support all boards which implement
headphone codec on SSP0 and speaker amplifiers 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/20240325221059.206042-16-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 4417e2b7adfdaadda2697bce22b29c6caa34167c..3057798a0dcad90021baacd0b3072c1a7755d7e0 100644 (file)
--- a/sound/soc/intel/boards/sof_da7219.c
+++ b/sound/soc/intel/boards/sof_da7219.c
@@ -375,13 +375,7 @@ static int audio_probe(struct platform_device *pdev)
 
 static const struct platform_device_id board_ids[] = {
        {
-               .name = "jsl_mx98373_da7219",
-               .driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD |
-                                       SOF_SSP_PORT_CODEC(0) |
-                                       SOF_SSP_PORT_AMP(1)),
-       },
-       {
-               .name = "jsl_mx98360_da7219",
+               .name = "jsl_da7219_def",
                .driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD |
                                        SOF_SSP_PORT_CODEC(0) |
                                        SOF_SSP_PORT_AMP(1)),

diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index a6ac2525df175ead327ac987f3f5ab7e129ba19a..d4b397c53bcc88cdb06f6af8bfd634981370177a 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -52,14 +52,14 @@ static const struct snd_soc_acpi_codecs rt5682_rt5682s_hp = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .id = "DLGS7219",
-               .drv_name = "jsl_mx98373_da7219",
+               .drv_name = "jsl_da7219_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mx98373_spk,
                .sof_tplg_filename = "sof-jsl-da7219.tplg",
        },
        {
                .id = "DLGS7219",
-               .drv_name = "jsl_mx98360_da7219",
+               .drv_name = "jsl_da7219_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mx98360a_spk,
                .sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",