Skip to content

Commit 2de911d

Browse files
udaymbplbossart
authored andcommitted
ASoC: Intel: soc-acpi: add Rex CS42l42 and MAX98363 SoundWire entries
Add support to the following daughter card for rex: SDW0: CS42l42 Headset SDW2: MX98363 Speaker Signed-off-by: Uday M Bhat <uday.m.bhat@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Yong Zhi <yong.zhi@intel.com>
1 parent 5dc3cc1 commit 2de911d

1 file changed

Lines changed: 45 additions & 0 deletions

File tree

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,45 @@ static const struct snd_soc_acpi_link_adr mtl_3_in_1_sdca[] = {
220220
{}
221221
};
222222

223+
static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = {
224+
{
225+
.adr = 0x000230019F836300ull,
226+
.num_endpoints = 1,
227+
.endpoints = &spk_l_endpoint,
228+
.name_prefix = "Left"
229+
},
230+
{
231+
.adr = 0x000231019F836300ull,
232+
.num_endpoints = 1,
233+
.endpoints = &spk_r_endpoint,
234+
.name_prefix = "Right"
235+
}
236+
};
237+
238+
static const struct snd_soc_acpi_adr_device cs42l42_0_adr[] = {
239+
{
240+
.adr = 0x00001001FA424200ull,
241+
.num_endpoints = 1,
242+
.endpoints = &single_endpoint,
243+
.name_prefix = "cs42l42"
244+
}
245+
};
246+
247+
static const struct snd_soc_acpi_link_adr cs42l42_link0_max98363_link2[] = {
248+
/* Expected order: jack -> amp */
249+
{
250+
.mask = BIT(0),
251+
.num_adr = ARRAY_SIZE(cs42l42_0_adr),
252+
.adr_d = cs42l42_0_adr,
253+
},
254+
{
255+
.mask = BIT(2),
256+
.num_adr = ARRAY_SIZE(mx8363_2_adr),
257+
.adr_d = mx8363_2_adr,
258+
},
259+
{}
260+
};
261+
223262
/* this table is used when there is no I2S codec present */
224263
struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
225264
/* mockup tests need to be first */
@@ -265,6 +304,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
265304
.drv_name = "sof_sdw",
266305
.sof_tplg_filename = "sof-mtl-sdw-rt5682-l2-max98373-l0.tplg",
267306
},
307+
{
308+
.link_mask = BIT(0) | BIT(2),
309+
.links = cs42l42_link0_max98363_link2,
310+
.drv_name = "sof_sdw",
311+
.sof_tplg_filename = "sof-mtl-sdw-cs42l42-l0-max98363-l2.tplg",
312+
},
268313
{},
269314
};
270315
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);

0 commit comments

Comments
 (0)