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

topology2: dai-copier: num_input_pins/num_output_pins shouldn't be mandatory 

Set them based on direction and the actual number of pins used.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-05-19 08:49:52 -07:00 committed by Kai Vehmanen
parent 66aaa599e9
commit 6e2d497371
17 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
View File

@ -94,6 +94,7 @@ Object.Pipeline {
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
num_output_pins 1
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32

2
tools/topology/topology2/cavs-nocodec-bt.conf
View File

@ -136,6 +136,7 @@ Object.Pipeline {
copier_type "SSP"
stream_name "NoCodec-0"
node_type $I2S_LINK_OUTPUT_CLASS
num_input_pins 1
}
}
{
@ -151,6 +152,7 @@ Object.Pipeline {
copier_type "SSP"
stream_name "NoCodec-1"
node_type $I2S_LINK_OUTPUT_CLASS
num_input_pins 1
}
}
]

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

@ -403,6 +403,7 @@ IncludeByKey.PASSTHROUGH {
copier_type "SSP"
stream_name "NoCodec-0"
node_type $I2S_LINK_OUTPUT_CLASS
num_input_pins 1
num_input_audio_formats 3
Object.Base.input_audio_format [
{
@ -445,6 +446,7 @@ IncludeByKey.PASSTHROUGH {
copier_type "SSP"
stream_name "NoCodec-2"
node_type $I2S_LINK_OUTPUT_CLASS
num_input_pins 1
num_input_audio_formats 3
Object.Base.input_audio_format [
{
@ -579,7 +581,9 @@ IncludeByKey.PASSTHROUGH {
copier_type "SSP"
stream_name "NoCodec-0"
node_type $I2S_LINK_INPUT_CLASS
num_output_pins 2
num_input_audio_formats 1
Object.Base.input_audio_format [
{
in_bit_depth 32

1
tools/topology/topology2/cavs-src-mixin-mixout-hda.conf
View File

@ -87,6 +87,7 @@ Object.Pipeline {
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
num_output_pins 1
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32

4
tools/topology/topology2/include/components/dai-copier.conf
View File

@ -130,8 +130,6 @@ Class.Widget."dai-copier" {
"no_pm"
"uuid"
"copier_type"
"num_input_pins"
"num_output_pins"
"num_input_audio_formats"
"num_output_audio_formats"
"node_type"
@ -163,8 +161,6 @@ Class.Widget."dai-copier" {
core_id 0
cpc 1647
bss_size 280
num_input_pins 1
num_output_pins 4
# math expression for computing is_pages
is_pages "$[(($bss_size + 4095) & -4095) / 4096]"

2
tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf
View File

@ -39,6 +39,8 @@ Class.Pipeline."dai-copier-be" {
type dai_in
num_input_audio_formats 3
num_output_audio_formats 3
num_output_pins 1
# 32-bit 48KHz 2ch
Object.Base.audio_format.1 {
in_bit_depth 32

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

@ -50,6 +50,8 @@ Class.Pipeline."dai-copier-eqiir-module-copier-capture" {
type dai_out
num_input_audio_formats 1
num_output_audio_formats 1
num_output_pins 1
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format.1 {
in_bit_depth 32

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

@ -50,6 +50,8 @@ Class.Pipeline."dai-copier-gain-mixin-capture" {
node_type $HDA_LINK_INPUT_CLASS
num_input_audio_formats 1
num_output_audio_formats 1
num_output_pins 1
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format.1 {
in_bit_depth 32

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

@ -49,6 +49,8 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" {
type dai_out
num_input_audio_formats 1
num_output_audio_formats 1
num_output_pins 1
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format.1 {
in_bit_depth 32

2
tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf
View File

@ -46,6 +46,8 @@ Class.Pipeline."dai-kpb-be" {
node_type $HDA_LINK_OUTPUT_CLASS
num_input_audio_formats 3
num_output_audio_formats 3
num_output_pins 1
# 32-bit 48KHz 2ch
Object.Base.audio_format.3 {
in_bit_depth 32

1
tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf
View File

@ -42,6 +42,7 @@ Class.Pipeline."highpass-capture-be" {
type dai_in
num_input_audio_formats 1
num_output_audio_formats 1
num_output_pins 1
Object.Base.audio_format.1 {
in_bit_depth 32

1
tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf
View File

@ -40,6 +40,7 @@ Class.Pipeline."io-gateway-capture" {
type dai_in
num_input_audio_formats 1
num_output_audio_formats 1
num_output_pins 1
Object.Base.audio_format.1 {
in_bit_depth 32

1
tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf
View File

@ -50,6 +50,7 @@ Class.Pipeline."mixout-gain-dai-copier-playback" {
type dai_in
num_input_audio_formats 1
num_output_audio_formats 1
num_input_pins 1
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format [

1
tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf
View File

@ -54,6 +54,7 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
type dai_in
num_input_audio_formats 2
num_output_audio_formats 2
num_input_pins 1
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format.1 {

1
tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf
View File

@ -49,6 +49,7 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" {
type dai_in
num_input_audio_formats 1
num_output_audio_formats 1
num_input_pins 1
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format [

2
tools/topology/topology2/platform/intel/bt-generic.conf
View File

@ -24,6 +24,8 @@ Object.Pipeline {
node_type $I2S_LINK_OUTPUT_CLASS
num_input_audio_formats 3
num_output_audio_formats 3
num_input_pins 1
Object.Base.audio_format.0 {
in_bit_depth 16
in_valid_bit_depth 16

4
tools/topology/topology2/platform/intel/hdmi-generic.conf
View File

@ -73,6 +73,7 @@ Object.Pipeline {
copier_type "HDA"
num_input_audio_formats 1
num_output_audio_formats 1
num_input_pins 1
# copier only supports 32-bit 48KHz 2ch
Object.Base.audio_format [
@ -97,6 +98,7 @@ Object.Pipeline {
copier_type "HDA"
num_input_audio_formats 1
num_output_audio_formats 1
num_input_pins 1
# copier only supports 32-bit 48KHz 2ch
Object.Base.audio_format [
@ -120,6 +122,7 @@ Object.Pipeline {
copier_type "HDA"
num_input_audio_formats 1
num_output_audio_formats 1
num_input_pins 1
# copier only supports 32-bit 48KHz 2ch
Object.Base.audio_format [
@ -221,6 +224,7 @@ IncludeByKey.NUM_HDMIS {
copier_type "HDA"
num_input_audio_formats 1
num_output_audio_formats 1
num_input_pins 1
# copier only supports 32-bit 48KHz 2ch
Object.Base.audio_format [