Skip to content

Topo2 fix nocodec capture devices - #7694

Merged
kv2019i merged 2 commits into
thesofproject:mainfrom
jsarha:topo2_fix_nocodec_capture_devices
Jun 2, 2023
Merged

kv2019i merged 2 commits into
thesofproject:mainfrom
jsarha:topo2_fix_nocodec_capture_devices

Conversation

@jsarha

@jsarha jsarha commented May 25, 2023

Copy link
Copy Markdown
Contributor

Supposed to fix #7093

@jsarha
jsarha requested a review from ranj063 as a code owner May 25, 2023 21:11
@jsarha

jsarha commented May 25, 2023

Copy link
Copy Markdown
Contributor Author

The PR has #7682 bellow it. I'll rebase as soon as #7682 is merged.

Jyri Sarha added 2 commits May 26, 2023 13:17
Rename cavs-nocodec capture PCMs. The current PCM names are confusing. These
should be better names for them. The former

"ssp-capture" is now "Port0 2nd Capture",
"DMIC0 Raw" is now "DMIC SFX1", and
"DMIC0 Raw 2" is now "DMIC SFX2".

The PCMs in question have extra gains in the path to simulate processing.
Also the mixer name is changed to compensate for the matching "Capture"
substring in the end of the PCM name, that is part of the mixer name,
to avoid "Capture Capture" tautology.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Rename "DMIC" PCM name to "DMIC Raw" in the generic dmic topology fragment.
The PCM is on the DMIC patch without any processing beyond gain and IIR EQ,
thus the "Raw" extension.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
@juimonen

Copy link
Copy Markdown

@jsarha so rebase, as base commit it merged?

@jsarha

jsarha commented May 31, 2023

Copy link
Copy Markdown
Contributor Author

@jsarha so rebase, as base commit it merged?

Already done.

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

@plbossart Good to go?

PASSTHROUGH "false"
SSP0_PCM_NAME "Port0"
SSP0_CAPTURE_PCM "ssp-capture"
SSP0_CAPTURE_PCM "Port0 2nd Capture"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Why is this "2nd Capture" , I can't immediately figure out... UPDATE: ok, checked the #7093 .

Comment thread tools/topology/topology2/platform/intel/dmic-generic.conf
@kv2019i

kv2019i commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

@kv2019i
kv2019i merged commit b9b0307 into thesofproject:main Jun 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] topology2: cavs-nocodec: fix capture device names

4 participants