Skip to content

Commit 347311d

Browse files
committed
ASoC: Intel: soc-acpi-intel-mtl-match: add rt713 rt1316 config
Adding rt713 jack + rt1316 amp + rt1713 dmic configuration support. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 5d0af43 commit 347311d

File tree

1 file changed

+66
-0
lines changed

1 file changed

+66
-0
lines changed

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,24 @@ static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = {
164164
}
165165
};
166166

167+
static const struct snd_soc_acpi_adr_device rt713_0_single_adr[] = {
168+
{
169+
.adr = 0x000031025D071301ull,
170+
.num_endpoints = 1,
171+
.endpoints = &single_endpoint,
172+
.name_prefix = "rt713"
173+
}
174+
};
175+
176+
static const struct snd_soc_acpi_adr_device rt1713_3_single_adr[] = {
177+
{
178+
.adr = 0x000331025D171301ull,
179+
.num_endpoints = 1,
180+
.endpoints = &single_endpoint,
181+
.name_prefix = "rt713-dmic"
182+
}
183+
};
184+
167185
static const struct snd_soc_acpi_adr_device mx8373_0_adr[] = {
168186
{
169187
.adr = 0x000023019F837300ull,
@@ -206,6 +224,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {
206224
}
207225
};
208226

227+
static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {
228+
{
229+
.adr = 0x000131025D131601ull,
230+
.num_endpoints = 1,
231+
.endpoints = &spk_l_endpoint,
232+
.name_prefix = "rt1316-1"
233+
}
234+
};
235+
236+
static const struct snd_soc_acpi_adr_device rt1316_2_group2_adr[] = {
237+
{
238+
.adr = 0x000230025D131601ull,
239+
.num_endpoints = 1,
240+
.endpoints = &spk_r_endpoint,
241+
.name_prefix = "rt1316-2"
242+
}
243+
};
244+
209245
static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = {
210246
{
211247
.adr = 0x000130025D131801ull,
@@ -362,6 +398,30 @@ static const struct snd_soc_acpi_link_adr mtl_sdw_rt1318_l12_rt714_l0[] = {
362398
{}
363399
};
364400

401+
static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12_rt1713_l3[] = {
402+
{
403+
.mask = BIT(0),
404+
.num_adr = ARRAY_SIZE(rt713_0_single_adr),
405+
.adr_d = rt713_0_single_adr,
406+
},
407+
{
408+
.mask = BIT(1),
409+
.num_adr = ARRAY_SIZE(rt1316_1_group2_adr),
410+
.adr_d = rt1316_1_group2_adr,
411+
},
412+
{
413+
.mask = BIT(2),
414+
.num_adr = ARRAY_SIZE(rt1316_2_group2_adr),
415+
.adr_d = rt1316_2_group2_adr,
416+
},
417+
{
418+
.mask = BIT(3),
419+
.num_adr = ARRAY_SIZE(rt1713_3_single_adr),
420+
.adr_d = rt1713_3_single_adr,
421+
},
422+
{}
423+
};
424+
365425
static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = {
366426
{
367427
.adr = 0x000230019F836300ull,
@@ -441,6 +501,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
441501
.drv_name = "sof_sdw",
442502
.sof_tplg_filename = "sof-mtl-rt715-rt711-rt1308-mono.tplg",
443503
},
504+
{
505+
.link_mask = GENMASK(3, 0),
506+
.links = mtl_rt713_l0_rt1316_l12_rt1713_l3,
507+
.drv_name = "sof_sdw",
508+
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg",
509+
},
444510
{
445511
.link_mask = BIT(3) | BIT(0),
446512
.links = mtl_712_only,

0 commit comments

Comments
 (0)