Merge tag 'asoc-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / soc / intel / common / soc-acpi-intel-mtl-match.c

diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index feb12c6..e9a5da0 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -62,7 +62,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
        },
        {
                .comp_ids = &mtl_rt5682_rt5682s_hp,
-               .drv_name = "mtl_rt1019_rt5682",
+               .drv_name = "mtl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mtl_rt1019p_amp,
                .sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg",
@@ -84,7 +84,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
        },
        {
                .id = "10EC5650",
-               .drv_name = "mtl_rt5650",
+               .drv_name = "mtl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mtl_rt5650_amp,
                .sof_tplg_filename = "sof-mtl-rt5650.tplg",
@@ -377,6 +377,37 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
+       {
+               .adr = 0x00023201FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00023301FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_3_endpoint,
+               .name_prefix = "AMP4"
+       }
+
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = {
+       {
+               .adr = 0x00033001fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00033101fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_2_endpoint,
+               .name_prefix = "AMP2"
+       }
+};
+
 static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {
        /* Expected order: jack -> amp */
        {
@@ -554,6 +585,26 @@ static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr cs42l43_link0_cs35l56_link2_link3[] = {
+       /* Expected order: jack -> amp */
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_0_adr),
+               .adr_d = cs42l43_0_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(cs35l56_2_r_adr),
+               .adr_d = cs35l56_2_r_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(cs35l56_3_l_adr),
+               .adr_d = cs35l56_3_l_adr,
+       },
+       {}
+};
+
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
        /* mockup tests need to be first */
@@ -599,6 +650,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-mtl-rt1318-l12-rt714-l0.tplg"
        },
+       {
+               .link_mask = BIT(0) | BIT(2) | BIT(3),
+               .links = cs42l43_link0_cs35l56_link2_link3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-cs42l43-l0-cs35l56-l23.tplg",
+       },
        {
                .link_mask = GENMASK(2, 0),
                .links = mtl_cs42l43_cs35l56,