Skip to content

ASoC: sdw_utils: Add quirk for disabling capture ch #5958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
niranjanhyti wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: sdw_utils: Add quirk for disabling capture ch #5958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions sound/soc/amd/acp/acp-sdw-legacy-mach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,
if (!soc_end->dai_info->direction[stream])
continue;

/*
* skip adding reference stream for amp type
* as legacy AMD doesn't use the DSP.
*/
if (soc_end->dai_info->dai_type == SOC_SDW_DAI_TYPE_AMP &&
stream == SNDRV_PCM_STREAM_CAPTURE)
continue;
Comment on lines +262 to +264

int link_num = ffs(soc_end->link_mask) - 1;

cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
Expand Down Expand Up @@ -438,6 +446,30 @@ static int soc_card_dai_links_create(struct snd_soc_card *card)

sdw_be_num = ret;

/*
* Legacy AMD has no DSP, so AMP reference capture streams are not
* supported. Subtract them from num_devs so create_sdw_dailink()
* uses the correct count directly, and decrement sdw_be_num when
* all capture endpoints on a DAI are AMP type.
*/
for (int i = 0; i < num_ends; i++) {
struct asoc_sdw_dailink *d = &soc_dais[i];
struct asoc_sdw_endpoint *e;

if (!d->initialised)
break;
if (!d->num_devs[SNDRV_PCM_STREAM_CAPTURE])
continue;

list_for_each_entry(e, &d->endpoints, list) {
if (e->dai_info->direction[SNDRV_PCM_STREAM_CAPTURE] &&
e->dai_info->dai_type == SOC_SDW_DAI_TYPE_AMP)
d->num_devs[SNDRV_PCM_STREAM_CAPTURE]--;
}
if (!d->num_devs[SNDRV_PCM_STREAM_CAPTURE])
sdw_be_num--;
}

/* enable dmic */
if (soc_sdw_quirk & ASOC_SDW_ACP_DMIC)
dmic_num = 1;
Expand Down
Loading