Skip to content

Commit 314e75f

Browse files
gongjun-songpull[bot]
authored andcommitted
ASoC: Intel: soc-acpi: add configuration for variant of 0C11 product
Support configuration with SoundWire RT1318 amplifiers on link1 and link2, and RT711 on link0 for headphone/headset. This product does not support local microphones. Signed-off-by: Gongjun Song <gongjun.song@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20221226010917.2632973-2-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 2cfdb97 commit 314e75f

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,25 @@ static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12_rt71
246246
{}
247247
};
248248

249+
static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12[] = {
250+
{
251+
.mask = BIT(0),
252+
.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),
253+
.adr_d = rt711_sdca_0_adr,
254+
},
255+
{
256+
.mask = BIT(1),
257+
.num_adr = ARRAY_SIZE(rt1318_1_group1_adr),
258+
.adr_d = rt1318_1_group1_adr,
259+
},
260+
{
261+
.mask = BIT(2),
262+
.num_adr = ARRAY_SIZE(rt1318_2_group1_adr),
263+
.adr_d = rt1318_2_group1_adr,
264+
},
265+
{}
266+
};
267+
249268
static const struct snd_soc_acpi_link_adr rpl_sdw_rt1316_link12_rt714_link0[] = {
250269
{
251270
.mask = BIT(1),
@@ -290,6 +309,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = {
290309
.drv_name = "sof_sdw",
291310
.sof_tplg_filename = "sof-rpl-rt711-l0-rt1318-l12-rt714-l3.tplg",
292311
},
312+
{
313+
.link_mask = 0x7, /* rt711 on link0 & two rt1318s on link1 and link2 */
314+
.links = rpl_sdw_rt711_link0_rt1318_link12,
315+
.drv_name = "sof_sdw",
316+
.sof_tplg_filename = "sof-rpl-rt711-l0-rt1318-l12.tplg",
317+
},
293318
{
294319
.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
295320
.links = rpl_sdw_rt1316_link12_rt714_link0,

0 commit comments

Comments
 (0)