ASoC: Intel: mtl-match: Add cs42l43_l0 cs35l56_l23 for MTL
Subsystems (3)
PATCH 1/1 ASoC: Intel: mtl-match: Add cs42l43_l0 cs35l56_l23 for MTL
Signed-off-by Maciej Strozek <[email protected]>
--- .../intel/common/soc-acpi-intel-mtl-match.c | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+)
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +56 -0
@@ -377,6 +377,36 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { } }; +static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = { + { + .adr =0x00023301FA355601ull , + .num_endpoints =1 , + .endpoints = &spk_r_endpoint, + .name_prefix ="AMP3" + }, + { + .adr =0x00023201FA355601ull , + .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 +584,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 +649,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,
Signature · 1 line
2.34.1
Quoted 17 lines · Maciej Strozek
Signed-off-by Maciej Strozek <[email protected]>--- .../intel/common/soc-acpi-intel-mtl-match.c | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+)sound/soc/intel/common/soc-acpi-intel-mtl-match.c +4
-0@@ -377,6 +377,36 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { } }; +static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = { + { + .adr =0x00023301FA355601ull , + .num_endpoints =1 ,
sound/soc/intel/common/soc-acpi-intel-mtl-match.c static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { · line 393
Quoted 10 lines
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +10
-0+ .endpoints = &spk_r_endpoint, + .name_prefix = "AMP3" + }, + { + .adr = 0x00023201FA355601ull, + .num_endpoints = 1, + .endpoints = &spk_3_endpoint, + .name_prefix = "AMP4" + } +};
Sorry the amp ordering is still weird here, can we have:
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"
}
};Thanks,
Charles
Quoted 15 lines
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +15
-0+ +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" + } +};