Skip to content

Commit 08f6f5f

Browse files
macchianMac Chiang
authored andcommitted
ASoC: Intel: soc-acpi-intel-adl-match: add rt711-l0-rt1316-l23-rt714-l1 support
Add adl support for the same configuration as: sof-mtl-rt711-l0-rt1316-l23-rt714-l1 sof-lnl-rt711-l0-rt1316-l23-rt714-l1 Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 5fe3143 commit 08f6f5f

1 file changed

Lines changed: 57 additions & 0 deletions

File tree

sound/soc/intel/common/soc-acpi-intel-adl-match.c

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,15 @@ static const struct snd_soc_acpi_adr_device rt1316_2_group1_adr[] = {
187187
}
188188
};
189189

190+
static const struct snd_soc_acpi_adr_device rt1316_2_l_group1_adr[] = {
191+
{
192+
.adr = 0x000230025D131601ull,
193+
.num_endpoints = 1,
194+
.endpoints = &spk_l_endpoint,
195+
.name_prefix = "rt1316-1"
196+
}
197+
};
198+
190199
static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {
191200
{
192201
.adr = 0x000330025D131601ull,
@@ -196,6 +205,15 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {
196205
}
197206
};
198207

208+
static const struct snd_soc_acpi_adr_device rt1316_3_r_group1_adr[] = {
209+
{
210+
.adr = 0x000331025D131601ull,
211+
.num_endpoints = 1,
212+
.endpoints = &spk_r_endpoint,
213+
.name_prefix = "rt1316-2"
214+
}
215+
};
216+
199217
static const struct snd_soc_acpi_adr_device rt1316_0_group2_adr[] = {
200218
{
201219
.adr = 0x000031025D131601ull,
@@ -259,6 +277,15 @@ static const struct snd_soc_acpi_adr_device rt714_0_adr[] = {
259277
}
260278
};
261279

280+
static const struct snd_soc_acpi_adr_device rt714_1_adr[] = {
281+
{
282+
.adr = 0x000130025D071401ull,
283+
.num_endpoints = 1,
284+
.endpoints = &single_endpoint,
285+
.name_prefix = "rt714"
286+
}
287+
};
288+
262289
static const struct snd_soc_acpi_adr_device rt714_2_adr[] = {
263290
{
264291
.adr = 0x000230025D071401ull,
@@ -349,6 +376,30 @@ static const struct snd_soc_acpi_link_adr adl_sdca_3_in_1[] = {
349376
{}
350377
};
351378

379+
static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link0_rt1316_link23_rt714_link1[] = {
380+
{
381+
.mask = BIT(0),
382+
.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),
383+
.adr_d = rt711_sdca_0_adr,
384+
},
385+
{
386+
.mask = BIT(2),
387+
.num_adr = ARRAY_SIZE(rt1316_2_l_group1_adr),
388+
.adr_d = rt1316_2_l_group1_adr,
389+
},
390+
{
391+
.mask = BIT(3),
392+
.num_adr = ARRAY_SIZE(rt1316_3_r_group1_adr),
393+
.adr_d = rt1316_3_r_group1_adr,
394+
},
395+
{
396+
.mask = BIT(1),
397+
.num_adr = ARRAY_SIZE(rt714_1_adr),
398+
.adr_d = rt714_1_adr,
399+
},
400+
{}
401+
};
402+
352403
static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link2_rt1316_link01_rt714_link3[] = {
353404
{
354405
.mask = BIT(2),
@@ -700,6 +751,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
700751
.drv_name = "sof_sdw",
701752
.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l13-rt714-l2.tplg",
702753
},
754+
{
755+
.link_mask = 0xF, /* 4 active links required */
756+
.links = adl_sdw_rt711_link0_rt1316_link23_rt714_link1,
757+
.drv_name = "sof_sdw",
758+
.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l23-rt714-l1.tplg",
759+
},
703760
{
704761
.link_mask = 0xF, /* 4 active links required */
705762
.links = adl_sdw_rt711_link2_rt1316_link01_rt714_link3,

0 commit comments

Comments
 (0)