Skip to content

Fix Nocodec capture PCM ID #7747

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

Merged
kv2019i merged 1 commit into from
Jun 15, 2023
Merged

Fix Nocodec capture PCM ID #7747

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
14 changes: 8 additions & 6 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ Define {
PASSTHROUGH "false"
SSP0_PCM_NAME "Port0"
SSP0_CAPTURE_PCM "Port0 2nd Capture"
SSP0_CAPTURE_PCM_ID 12

@plbossart plbossart Jun 6, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why isn't this zero? I don't get this.

@ranj063 ranj063 Jun 6, 2023

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

There are 2 capture PCMs, @plbossart . Pcm0 and pcm12

@ranj063 ranj063 Jun 6, 2023

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

You can see the 2 PCM names just above

@plbossart plbossart Jun 7, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

if SSP0_CAPTURE_PCM is about a 2nd part, why isn't the naming a bit self-explanatory, e.g. SSP0_2ND_CAPTURE_PCM?

@ranj063 ranj063 Jun 7, 2023

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I kept it consisten with the PCM name on line 86

SSP0_PCM_ID 0
SSP1_PCM_NAME "Port1"
SSP2_PCM_NAME "Port2"
DMIC0_PCM_0_NAME "DMIC SFX1"
Expand Down Expand Up @@ -266,7 +268,7 @@ IncludeByKey.PASSTHROUGH {

Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id 7
pcm_id $SSP0_PCM_ID
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
Expand All @@ -280,7 +282,7 @@ IncludeByKey.PASSTHROUGH {
format s32le
Object.Widget.host-copier.1 {
stream_name 'SSP0-1 Capture'
pcm_id 12
pcm_id $SSP0_CAPTURE_PCM_ID
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
Expand Down Expand Up @@ -758,7 +760,7 @@ IncludeByKey.PASSTHROUGH {
Object.PCM.pcm [
{
name "$SSP0_PCM_NAME"
id 0
id $SSP0_PCM_ID
direction "duplex"
Object.Base.fe_dai.1 {
name "$SSP0_PCM_NAME"
Expand Down Expand Up @@ -803,7 +805,7 @@ IncludeByKey.PASSTHROUGH {
Object.PCM.pcm [
{
name "$SSP0_CAPTURE_PCM"
id 12
id $SSP0_CAPTURE_PCM_ID
direction "capture"
Object.Base.fe_dai.1 {
name "$SSP0_CAPTURE_PCM"
Expand Down Expand Up @@ -913,11 +915,11 @@ IncludeByKey.PASSTHROUGH {
}
{
source "gain.7.1"
sink "host-copier.7.capture"
sink "host-copier.$SSP0_PCM_ID.capture"
}
{
source "gain.17.1"
sink "host-copier.12.capture"
sink "host-copier.$SSP0_CAPTURE_PCM_ID.capture"
}
]
}
Expand Down