Skip to content

Commit f41b320

Browse files
ujfalusiujfalusi
committed
tools: topology2: cavs-nocodec: Fix PASSTHROUGH configuration for SSPs
The purpose of PASSTHROUGH is to exclude processing modules from paths, but in case of the nocodec topologies the PASSTHROUGH enables formats on the SSP DAI side for which we don't have a blob generated and no hw_config either. We only really support in this mode S32_LE and nothing else, S16_LE and S24_LE formats are invalid. Support only S32_LE on dai side only and do the conversion if needed on the host side so all internal (non-)processing is 32bit. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: #9979
1 parent b6ee409 commit f41b320

File tree

1 file changed

+11
-121
lines changed

1 file changed

+11
-121
lines changed

‎tools/topology/topology2/cavs-nocodec.conf‎

Lines changed: 11 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -516,36 +516,16 @@ IncludeByKey.PASSTHROUGH {
516516
stream_name "NoCodec-0"
517517
node_type $I2S_LINK_OUTPUT_CLASS
518518
num_input_pins 1
519-
num_input_audio_formats 3
519+
num_input_audio_formats 1
520520
Object.Base.input_audio_format [
521-
{
522-
in_rate $SSP0_RATE
523-
in_bit_depth 16
524-
in_valid_bit_depth 16
525-
}
526-
{
527-
in_rate $SSP0_RATE
528-
in_bit_depth 32
529-
in_valid_bit_depth 24
530-
}
531521
{
532522
in_rate $SSP0_RATE
533523
in_bit_depth 32
534524
in_valid_bit_depth 32
535525
}
536526
]
537-
num_output_audio_formats 3
527+
num_output_audio_formats 1
538528
Object.Base.output_audio_format [
539-
{
540-
out_rate $SSP0_RATE
541-
out_bit_depth 16
542-
out_valid_bit_depth 16
543-
}
544-
{
545-
out_rate $SSP0_RATE
546-
out_bit_depth 32
547-
out_valid_bit_depth 24
548-
}
549529
{
550530
out_rate $SSP0_RATE
551531
out_bit_depth 32
@@ -565,36 +545,16 @@ IncludeByKey.PASSTHROUGH {
565545
stream_name "NoCodec-2"
566546
node_type $I2S_LINK_OUTPUT_CLASS
567547
num_input_pins 1
568-
num_input_audio_formats 3
548+
num_input_audio_formats 1
569549
Object.Base.input_audio_format [
570-
{
571-
in_rate $SSP2_RATE
572-
in_bit_depth 16
573-
in_valid_bit_depth 16
574-
}
575-
{
576-
in_rate $SSP2_RATE
577-
in_bit_depth 32
578-
in_valid_bit_depth 24
579-
}
580550
{
581551
in_rate $SSP2_RATE
582552
in_bit_depth 32
583553
in_valid_bit_depth 32
584554
}
585555
]
586-
num_output_audio_formats 3
556+
num_output_audio_formats 1
587557
Object.Base.output_audio_format [
588-
{
589-
out_rate $SSP2_RATE
590-
out_bit_depth 16
591-
out_valid_bit_depth 16
592-
}
593-
{
594-
out_rate $SSP2_RATE
595-
out_bit_depth 32
596-
out_valid_bit_depth 24
597-
}
598558
{
599559
out_rate $SSP2_RATE
600560
out_bit_depth 32
@@ -629,18 +589,8 @@ IncludeByKey.PASSTHROUGH {
629589
in_valid_bit_depth 32
630590
}
631591
]
632-
num_output_audio_formats 3
592+
num_output_audio_formats 1
633593
Object.Base.output_audio_format [
634-
{
635-
out_rate $SSP0_RATE
636-
out_bit_depth 16
637-
out_valid_bit_depth 16
638-
}
639-
{
640-
out_rate $SSP0_RATE
641-
out_bit_depth 32
642-
out_valid_bit_depth 24
643-
}
644594
{
645595
out_rate $SSP0_RATE
646596
out_bit_depth 32
@@ -673,18 +623,8 @@ IncludeByKey.PASSTHROUGH {
673623
in_valid_bit_depth 32
674624
}
675625
]
676-
num_output_audio_formats 3
626+
num_output_audio_formats 1
677627
Object.Base.output_audio_format [
678-
{
679-
out_rate $SSP2_RATE
680-
out_bit_depth 16
681-
out_valid_bit_depth 16
682-
}
683-
{
684-
out_rate $SSP2_RATE
685-
out_bit_depth 32
686-
out_valid_bit_depth 24
687-
}
688628
{
689629
out_rate $SSP2_RATE
690630
out_bit_depth 32
@@ -702,18 +642,8 @@ IncludeByKey.PASSTHROUGH {
702642
Object.Widget.host-copier.1 {
703643
stream_name 'SSP0 Capture'
704644
pcm_id 0
705-
num_input_audio_formats 3
645+
num_input_audio_formats 1
706646
Object.Base.input_audio_format [
707-
{
708-
in_rate $SSP0_RATE
709-
in_bit_depth 16
710-
in_valid_bit_depth 16
711-
}
712-
{
713-
in_rate $SSP0_RATE
714-
in_bit_depth 32
715-
in_valid_bit_depth 24
716-
}
717647
{
718648
in_rate $SSP0_RATE
719649
in_bit_depth 32
@@ -747,18 +677,8 @@ IncludeByKey.PASSTHROUGH {
747677
Object.Widget.host-copier.1 {
748678
stream_name 'SSP2 Capture'
749679
pcm_id 2
750-
num_input_audio_formats 3
680+
num_input_audio_formats 1
751681
Object.Base.input_audio_format [
752-
{
753-
in_rate $SSP2_RATE
754-
in_bit_depth 16
755-
in_valid_bit_depth 16
756-
}
757-
{
758-
in_rate $SSP2_RATE
759-
in_bit_depth 32
760-
in_valid_bit_depth 24
761-
}
762682
{
763683
in_rate $SSP2_RATE
764684
in_bit_depth 32
@@ -1535,36 +1455,16 @@ IncludeByKey.SSP1_ENABLED {
15351455
copier_type "SSP"
15361456
stream_name "NoCodec-1"
15371457
node_type $I2S_LINK_OUTPUT_CLASS
1538-
num_input_audio_formats 3
1458+
num_input_audio_formats 1
15391459
Object.Base.input_audio_format [
1540-
{
1541-
in_rate $SSP1_RATE
1542-
in_bit_depth 16
1543-
in_valid_bit_depth 16
1544-
}
1545-
{
1546-
in_rate $SSP1_RATE
1547-
in_bit_depth 32
1548-
in_valid_bit_depth 24
1549-
}
15501460
{
15511461
in_rate $SSP1_RATE
15521462
in_bit_depth 32
15531463
in_valid_bit_depth 32
15541464
}
15551465
]
1556-
num_output_audio_formats 3
1466+
num_output_audio_formats 1
15571467
Object.Base.output_audio_format [
1558-
{
1559-
out_rate $SSP1_RATE
1560-
out_bit_depth 16
1561-
out_valid_bit_depth 16
1562-
}
1563-
{
1564-
out_rate $SSP1_RATE
1565-
out_bit_depth 32
1566-
out_valid_bit_depth 24
1567-
}
15681468
{
15691469
out_rate $SSP1_RATE
15701470
out_bit_depth 32
@@ -1598,18 +1498,8 @@ IncludeByKey.SSP1_ENABLED {
15981498
in_valid_bit_depth 32
15991499
}
16001500
]
1601-
num_output_audio_formats 3
1501+
num_output_audio_formats 1
16021502
Object.Base.output_audio_format [
1603-
{
1604-
out_rate $SSP1_RATE
1605-
out_bit_depth 16
1606-
out_valid_bit_depth 16
1607-
}
1608-
{
1609-
out_rate $SSP1_RATE
1610-
out_bit_depth 32
1611-
out_valid_bit_depth 24
1612-
}
16131503
{
16141504
out_rate $SSP1_RATE
16151505
out_bit_depth 32

0 commit comments

Comments
 (0)