Skip to content

Commit

Permalink
ASoC: Intel: soc-acpi-intel-mtl-match: add rt713 rt1316 config
Browse files Browse the repository at this point in the history
Adding rt713 jack + rt1316 amp + rt1713 dmic configuration support.

Signed-off-by: Bard Liao <[email protected]>
  • Loading branch information
bardliao committed Oct 12, 2023
1 parent 5d0af43 commit 347311d
Showing 1 changed file with 66 additions and 0 deletions.
66 changes: 66 additions & 0 deletions sound/soc/intel/common/soc-acpi-intel-mtl-match.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,24 @@ static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = {
}
};

static const struct snd_soc_acpi_adr_device rt713_0_single_adr[] = {
{
.adr = 0x000031025D071301ull,
.num_endpoints = 1,
.endpoints = &single_endpoint,
.name_prefix = "rt713"
}
};

static const struct snd_soc_acpi_adr_device rt1713_3_single_adr[] = {
{
.adr = 0x000331025D171301ull,
.num_endpoints = 1,
.endpoints = &single_endpoint,
.name_prefix = "rt713-dmic"
}
};

static const struct snd_soc_acpi_adr_device mx8373_0_adr[] = {
{
.adr = 0x000023019F837300ull,
Expand Down Expand Up @@ -206,6 +224,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {
}
};

static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {
{
.adr = 0x000131025D131601ull,
.num_endpoints = 1,
.endpoints = &spk_l_endpoint,
.name_prefix = "rt1316-1"
}
};

static const struct snd_soc_acpi_adr_device rt1316_2_group2_adr[] = {
{
.adr = 0x000230025D131601ull,
.num_endpoints = 1,
.endpoints = &spk_r_endpoint,
.name_prefix = "rt1316-2"
}
};

static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = {
{
.adr = 0x000130025D131801ull,
Expand Down Expand Up @@ -362,6 +398,30 @@ static const struct snd_soc_acpi_link_adr mtl_sdw_rt1318_l12_rt714_l0[] = {
{}
};

static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12_rt1713_l3[] = {
{
.mask = BIT(0),
.num_adr = ARRAY_SIZE(rt713_0_single_adr),
.adr_d = rt713_0_single_adr,
},
{
.mask = BIT(1),
.num_adr = ARRAY_SIZE(rt1316_1_group2_adr),
.adr_d = rt1316_1_group2_adr,
},
{
.mask = BIT(2),
.num_adr = ARRAY_SIZE(rt1316_2_group2_adr),
.adr_d = rt1316_2_group2_adr,
},
{
.mask = BIT(3),
.num_adr = ARRAY_SIZE(rt1713_3_single_adr),
.adr_d = rt1713_3_single_adr,
},
{}
};

static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = {
{
.adr = 0x000230019F836300ull,
Expand Down Expand Up @@ -441,6 +501,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-mtl-rt715-rt711-rt1308-mono.tplg",
},
{
.link_mask = GENMASK(3, 0),
.links = mtl_rt713_l0_rt1316_l12_rt1713_l3,
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg",
},
{
.link_mask = BIT(3) | BIT(0),
.links = mtl_712_only,
Expand Down

0 comments on commit 347311d

Please sign in to comment.