ASoC: Intel: sof_rt5682: add adl_rt5650 board config

This configuration supports ADL boards which implement ALC5650 dual
I2S interface codec. Two DAI links are added: AIF1 (on codec side) for
headphone and AIF2 for speakers.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230915124852.1696857-11-yung-chuan.liao@linux.intel.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 bbe15c36b855c70ebe7177a03deffcd84064192c..f5767f9e506d2d87f03847a478395638bffb9187 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1153,6 +1153,12 @@ static const struct platform_device_id board_ids[] = {
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
                                        SOF_RT5682_SSP_CODEC(0)),
        },
+       {
+               .name = "jsl_rt5650",
+               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+                                       SOF_RT5682_SSP_CODEC(0) |
+                                       SOF_RT5682_SSP_AMP(1)),
+       },
        {
                .name = "tgl_mx98357_rt5682",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
@@ -1239,6 +1245,15 @@ static const struct platform_device_id board_ids[] = {
                                        /* SSP 0 and SSP 2 are used for HDMI IN */
                                        SOF_HDMI_CAPTURE_SSP_MASK(0x5)),
        },
+       {
+               .name = "adl_rt5650",
+               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+                                       SOF_RT5682_SSP_CODEC(0) |
+                                       SOF_RT5682_SSP_AMP(1) |
+                                       SOF_RT5682_NUM_HDMIDEV(4) |
+                                       SOF_BT_OFFLOAD_SSP(2) |
+                                       SOF_SSP_BT_OFFLOAD_PRESENT),
+       },
        {
                .name = "rpl_mx98357_rt5682",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
@@ -1287,12 +1302,6 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_RT5682_SSP_AMP(0) |
                                        SOF_RT5682_NUM_HDMIDEV(3)),
        },
-       {
-               .name = "jsl_rt5650",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
        { }
 };
 MODULE_DEVICE_TABLE(platform, board_ids);

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 8e995edf4c10da3e5328009eb1c027fb29e03f77..4e9787870f60f40354a83d7f7715cd20a3e106d0 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -492,6 +492,11 @@ static const struct snd_soc_acpi_codecs adl_nau8318_amp = {
        .codecs = {"NVTN2012"}
 };
 
+static struct snd_soc_acpi_codecs adl_rt5650_amp = {
+       .num_codecs = 1,
+       .codecs = {"10EC5650"}
+};
+
 struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
        {
                .comp_ids = &adl_rt5682_rt5682s_hp,
@@ -602,6 +607,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                                        SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |
                                        SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
        },
+       {
+               .id = "10EC5650",
+               .drv_name = "adl_rt5650",
+               .machine_quirk = snd_soc_acpi_codec_list,
+               .quirk_data = &adl_rt5650_amp,
+               .sof_tplg_filename = "sof-adl-rt5650.tplg",
+       },
        /* place amp-only boards in the end of table */
        {
                .id = "CSC3541",