ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p

This patch adds the driver data for two rt1019 speaker amplifiers on
SSP1 and ALC5682I-VD on SSP0 for ADL platform.

Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20221108042716.2930255-2-ajye_huang@compal.corp-partner.google.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 2d0986824b3d7a45d3a08877eb6bf91403c3796d..ffec9e4a51035256a2d5d142d1431c0e6dffe69a 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1080,10 +1080,9 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_SSP_BT_OFFLOAD_PRESENT),
        },
        {
-               .name = "adl_rt1019_rt5682s",
+               .name = "adl_rt1019_rt5682",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
                                        SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682S_HEADPHONE_CODEC_PRESENT |
                                        SOF_SPEAKER_AMP_PRESENT |
                                        SOF_RT1019_SPEAKER_AMP_PRESENT |
                                        SOF_RT5682_SSP_AMP(1) |

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 9990d5502d264689b20befd46ec665ba3f7c28cf..3ca0a96d94de82380522e425378bd8eec9daff00 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -489,8 +489,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg",
        },
        {
-               .id = "RTL5682",
-               .drv_name = "adl_rt1019_rt5682s",
+               .comp_ids = &adl_rt5682_rt5682s_hp,
+               .drv_name = "adl_rt1019_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_rt1019p_amp,
                .sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg",