OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "topology2: cavs-nocodec: add a module copier to SSP 0 capture pipeline" 

DAI copiers now support multiple sinks. So revert the temporary
workaround in the cavs-nocodec topology.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-05-08 11:12:28 -07:00 committed by Kai Vehmanen
parent 5e60b3721e
commit 9e7ec5a3f2
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/topology/topology2/cavs-nocodec.conf
View File

@ -222,7 +222,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Base.input_pin_binding.2 {
input_pin_binding_name "module-copier.8.1"
input_pin_binding_name "copier.SSP.8.1"
}
Object.Control.bytes."1" {
@ -354,9 +354,7 @@ IncludeByKey.PASSTHROUGH {
out_bit_depth 32
out_valid_bit_depth 32
}
}
Object.Widget.module-copier.1 {
Object.Base.output_pin_binding.1 {
output_pin_binding_name "gain.8.1"
}
@ -851,7 +849,7 @@ IncludeByKey.PASSTHROUGH {
}
{
source "copier.SSP.8.1"
sink "module-copier.8.1"
sink "gain.8.1"
}
{
source "module-copier.8.2"
@ -874,7 +872,7 @@ IncludeByKey.PASSTHROUGH {
sink gain.20.1
}
{
source "module-copier.8.1"
source "copier.SSP.8.1"
sink "smart_amp.2.1"
}
]

14
tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf
View File

@ -57,16 +57,6 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" {
out_valid_bit_depth 32
}
}
module-copier."1" {
num_input_audio_formats 1
num_output_audio_formats 1
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
}
}
module-copier."2" {
num_input_audio_formats 1
@ -102,10 +92,6 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" {
source gain.$index.1
sink module-copier.$index.2
}
route.2 {
source module-copier.$index.1
sink gain.$index.1
}
}
direction "capture"