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

Introduce "rpl_da7219_def" board to reduce the number of rpl 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-18-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 0da7aa2e31c298eccdf934258b2b22d86ee011bc..fd3a7be993c193926116844ab1f34029e1359879 100644 (file)
--- a/sound/soc/intel/boards/sof_da7219.c
+++ b/sound/soc/intel/boards/sof_da7219.c
@@ -390,7 +390,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_BT_OFFLOAD_PRESENT),
        },
        {
-               .name = "rpl_mx98360_da7219",
+               .name = "rpl_da7219_def",
                .driver_data = (kernel_ulong_t)(SOF_DA7219_MCLK_EN |
                                        SOF_SSP_PORT_CODEC(0) |
                                        SOF_SSP_PORT_AMP(1) |

diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
index c43e537e60d2c8e5ca87de9692249c99c8986c3d..77c917897c8d1c2fc9f0c468509ac11b849cecaa 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -457,7 +457,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
        },
        {
                .id = "DLGS7219",
-               .drv_name = "rpl_mx98360_da7219",
+               .drv_name = "rpl_da7219_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rpl_max98360a_amp,
                .sof_tplg_filename = "sof-rpl-max98360a-da7219.tplg",