Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions sound/soc/intel/common/soc-acpi-intel-ptl-match.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,15 @@ static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {
}
};

static const struct snd_soc_acpi_adr_device rt721_3_group1_adr[] = {
{
.adr = 0x000330025d072101ull,
.num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),
.endpoints = jack_amp_g1_dmic_endpoints,
.name_prefix = "rt721"
}
};

static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = {
{
.mask = BIT(3),
Expand Down Expand Up @@ -514,6 +523,20 @@ static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] = {
{}
};

static const struct snd_soc_acpi_link_adr ptl_sdw_rt721_l3_rt1320_l3[] = {
{
.mask = BIT(3),
.num_adr = ARRAY_SIZE(rt721_3_group1_adr),
.adr_d = rt721_3_group1_adr,
},
{
.mask = BIT(3),
.num_adr = ARRAY_SIZE(rt1320_3_group1_adr),
.adr_d = rt1320_3_group1_adr,
},
{}
};

static const struct snd_soc_acpi_link_adr ptl_rvp[] = {
{
.mask = BIT(0),
Expand Down Expand Up @@ -710,6 +733,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l3.tplg",
.get_function_tplg_files = sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(3),
.links = ptl_sdw_rt721_l3_rt1320_l3,
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-ptl-rt721-l3-rt1320-l3.tplg",
.get_function_tplg_files = sof_sdw_get_tplg_files,
},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use #5596 instead of adding matches for PTL?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sharing. I would test it. Before that I assume this requires SDCA Disco table support, right? Currently, Disco SDCA functions is not yet supported in customer projects. Is it still able to load the best_effort link ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sharing. I would test it. Before that I assume this requires SDCA Disco table support, right? Currently, Disco SDCA functions is not yet supported in customer projects. Is it still able to load the best_effort link ?

s/customer projects/chrome projects. I believe laptop projects all have SDCA Disco table support in the BIOS since it is required by Windows, too.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To correct my wording. Yes, I am mentioning the chrome and android projects.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@macchian, still we prefer to not add match entries if possible, so can you try the #5596 without this PR and see if you have audio probed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree the Disco table is preferred to match table. However, based on #5596, it requires the coreboot support the SDCA Disco table at first.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hrm, this is for PTL, not NVL, right? Do we have the topology already built? We must have the topology built before we can add a new match entry (plus the -2ch and -4ch variants).

@bardliao, @kv2019i, should we allow more monolithic topologies to be added?

{
.link_mask = BIT(3),
.links = ptl_rt721_l3,
Expand Down
Loading