ASoC: Intel: soc-acpi-intel-ptl-match: Add rt721 support

Patch adds driver data & match table for rt721
multi-function codec on PTL-RVP at sdw link3.

Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241007075955.12575-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
index 5ed905440e9d867316c3513c58147a9b01f4fe96..f1c0d7a02cda38939d0156bcf4d0e63ee20d1a09 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -69,6 +69,24 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {
+       {
+               .adr = 0x000330025d072101ull,
+               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
+               .endpoints = rt_mf_endpoints,
+               .name_prefix = "rt721"
+       }
+};
+
+static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = {
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt721_3_single_adr),
+               .adr_d = rt721_3_single_adr,
+       },
+       {},
+};
+
 static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {
        {
                .adr = 0x000030025d072201ull,
@@ -159,6 +177,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-ptl-rt711.tplg",
        },
+       {
+               .link_mask = BIT(3),
+               .links = ptl_rt721_l3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-ptl-rt721.tplg",
+       },
        {
                .link_mask = BIT(0),
                .links = ptl_rt722_only,

diff --git a/sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c b/sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c
index 8143d59ad10fa966689b11ecf2775825fbc6f095..81e43319876e775c1663ff3e708588d82f02e925 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c
+++ b/sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c
@@ -25,6 +25,10 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
        { "Speaker", NULL, "rt712 SPOR" },
 };
 
+static const struct snd_soc_dapm_route rt721_spk_map[] = {
+       { "Speaker", NULL, "rt721 SPK" },
+};
+
 static const struct snd_soc_dapm_route rt722_spk_map[] = {
        { "Speaker", NULL, "rt722 SPK" },
 };
@@ -39,6 +43,7 @@ struct codec_route_map {
 /* Codec route maps array */
 static const struct codec_route_map codec_routes[] = {
        { "rt712", rt712_spk_map, ARRAY_SIZE(rt712_spk_map) },
+       { "rt721", rt721_spk_map, ARRAY_SIZE(rt721_spk_map) },
        { "rt722", rt722_spk_map, ARRAY_SIZE(rt722_spk_map) },
 };
 

diff --git a/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c b/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
index 3e6211dc1599a86c85229f829472cd6fe476f4e5..af43efbb8f79c98e276d1d74b5539e0137bf1360 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
+++ b/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
@@ -60,6 +60,11 @@ static const struct snd_soc_dapm_route rt713_sdca_map[] = {
        { "rt713 MIC2", NULL, "Headset Mic" },
 };
 
+static const struct snd_soc_dapm_route rt721_sdca_map[] = {
+       { "Headphone", NULL, "rt721 HP" },
+       { "rt721 MIC2", NULL, "Headset Mic" },
+};
+
 static const struct snd_soc_dapm_route rt722_sdca_map[] = {
        { "Headphone", NULL, "rt722 HP" },
        { "rt722 MIC2", NULL, "Headset Mic" },
@@ -121,6 +126,9 @@ int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_s
        } else if (strstr(component->name_prefix, "rt713")) {
                ret = snd_soc_dapm_add_routes(&card->dapm, rt713_sdca_map,
                                              ARRAY_SIZE(rt713_sdca_map));
+       } else if (strstr(component->name_prefix, "rt721")) {
+               ret = snd_soc_dapm_add_routes(&card->dapm, rt721_sdca_map,
+                                             ARRAY_SIZE(rt721_sdca_map));
        } else if (strstr(component->name_prefix, "rt722")) {
                ret = snd_soc_dapm_add_routes(&card->dapm, rt722_sdca_map,
                                              ARRAY_SIZE(rt722_sdca_map));

diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index 3b1af6c81e838b02a43aa59a922298cd0b5cc1ef..a9323cb444d02f6e4e8e53d2964229d699c15c8c 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -333,6 +333,47 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                },
                .dai_num = 1,
        },
+       {
+               .part_id = 0x721,
+               .version_id = 3,
+               .dais = {
+                       {
+                               .direction = {true, true},
+                               .dai_name = "rt721-sdca-aif1",
+                               .dai_type = SOC_SDW_DAI_TYPE_JACK,
+                               .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
+                               .init = asoc_sdw_rt_sdca_jack_init,
+                               .exit = asoc_sdw_rt_sdca_jack_exit,
+                               .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
+                       },
+                       {
+                               .direction = {true, false},
+                               .dai_name = "rt721-sdca-aif2",
+                               .dai_type = SOC_SDW_DAI_TYPE_AMP,
+                               /* No feedback capability is provided by rt721-sdca codec driver*/
+                               .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt_mf_sdca_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
+                       },
+                       {
+                               .direction = {false, true},
+                               .dai_name = "rt721-sdca-aif3",
+                               .dai_type = SOC_SDW_DAI_TYPE_MIC,
+                               .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
+                       },
+               },
+               .dai_num = 3,
+       },
        {
                .part_id = 0x722,
                .version_id = 3,