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

topology2: tokens: Split the tokens for input/output pin index 

Separate the pin index token ID for input/output pin index to avoid
collisions between the two and incorrect pin index parsing in the
kernel.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-04-12 09:06:29 -07:00 committed by Ranjani Sridharan
parent b77dbc3c88
commit e5eb7dfc76
5 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/topology/topology2/include/common/input_audio_format.conf
View File

@ -15,7 +15,7 @@ Class.Base."input_audio_format" {
DefineAttribute."instance" { DefineAttribute."instance" {
} }
DefineAttribute."pin_index" { DefineAttribute."input_pin_index" {
# Token set reference name # Token set reference name
token_ref "sof_tkn_cavs_audio_format.word" token_ref "sof_tkn_cavs_audio_format.word"
} }

2
tools/topology/topology2/include/common/output_audio_format.conf
View File

@ -15,7 +15,7 @@ Class.Base."output_audio_format" {
DefineAttribute."instance" { DefineAttribute."instance" {
} }
DefineAttribute."pin_index" { DefineAttribute."output_pin_index" {
# Token set reference name # Token set reference name
token_ref "sof_tkn_cavs_audio_format.word" token_ref "sof_tkn_cavs_audio_format.word"
} }

3
tools/topology/topology2/include/common/tokens.conf
View File

@ -156,7 +156,7 @@ Object.Base.VendorToken {
in_interleaving_style 1906 in_interleaving_style 1906
in_fmt_cfg 1907 in_fmt_cfg 1907
in_sample_type 1908 in_sample_type 1908
pin_index 1909 input_pin_index 1909
# tokens up to 1929 reserved for future use # tokens up to 1929 reserved for future use
out_rate 1930 out_rate 1930
out_bit_depth 1931 out_bit_depth 1931
@ -167,6 +167,7 @@ Object.Base.VendorToken {
out_interleaving_style 1936 out_interleaving_style 1936
out_fmt_cfg 1937 out_fmt_cfg 1937
out_sample_type 1938 out_sample_type 1938
output_pin_index 1939
# tokens up to 1969 reserved for future use # tokens up to 1969 reserved for future use
ibs 1970 ibs 1970
obs 1971 obs 1971

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

@ -46,32 +46,33 @@ Class.Pipeline."io-gateway" {
num_input_audio_formats 3 num_input_audio_formats 3
num_output_audio_formats 3 num_output_audio_formats 3
# 32-bit 48KHz 2ch # 32-bit 48KHz 2ch
Object.Base.audio_format.3 { Object.Base.audio_format [
in_bit_depth 32 {
in_valid_bit_depth 24 in_bit_depth 32
out_bit_depth 32 in_valid_bit_depth 24
out_valid_bit_depth 24 out_bit_depth 32
} out_valid_bit_depth 24
}
Object.Base.audio_format.1 { {
in_bit_depth 32 in_bit_depth 32
in_valid_bit_depth 32 in_valid_bit_depth 32
out_bit_depth 32 out_bit_depth 32
out_valid_bit_depth 32 out_valid_bit_depth 32
} }
# 32-bit 48KHz 4ch # 32-bit 48KHz 4ch
Object.Base.audio_format.2 { {
in_channels 4 in_channels 4
in_bit_depth 32 in_bit_depth 32
in_valid_bit_depth 32 in_valid_bit_depth 32
out_channels 4 out_channels 4
out_bit_depth 32 out_bit_depth 32
out_valid_bit_depth 32 out_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1 in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1 out_ch_map $CHANNEL_MAP_3_POINT_1
} }
]
} }
pipeline."1" { pipeline."1" {

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

@ -93,18 +93,18 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" {
# 32-bit 48KHz 2ch # 32-bit 48KHz 2ch
Object.Base.input_audio_format { Object.Base.input_audio_format {
1 { 1 {
pin_index 0 input_pin_index 0
in_bit_depth 32 in_bit_depth 32
in_valid_bit_depth 32 in_valid_bit_depth 32
} }
2 { 2 {
pin_index 1 input_pin_index 1
in_bit_depth 32 in_bit_depth 32
in_valid_bit_depth 32 in_valid_bit_depth 32
} }
} }
Object.Base.output_audio_format.1 { Object.Base.output_audio_format.1 {
pin_index 0 output_pin_index 0
out_bit_depth 32 out_bit_depth 32
out_valid_bit_depth 32 out_valid_bit_depth 32
} }