diff --git a/tools/topology/topology2/cavs/cavs-gain-hda.conf b/tools/topology/topology2/cavs/cavs-gain-hda.conf index 333a6463b..c1690e9a5 100644 --- a/tools/topology/topology2/cavs/cavs-gain-hda.conf +++ b/tools/topology/topology2/cavs/cavs-gain-hda.conf @@ -14,7 +14,6 @@ Object.Dai { stream_name 'Analog Playback and Capture' period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -39,7 +38,6 @@ Object.Dai { stream_name 'Analog Playback and Capture' period_sink_count 2 period_source_count 0 - format s32le node_type $HDA_LINK_INPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -72,7 +70,6 @@ Object.Dai { stream_name 'Digital Playback and Capture' period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -97,7 +94,6 @@ Object.Dai { stream_name 'Digital Playback and Capture' period_sink_count 2 period_source_count 0 - format s32le node_type $HDA_LINK_INPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch diff --git a/tools/topology/topology2/cavs/cavs-gain-hdmi.conf b/tools/topology/topology2/cavs/cavs-gain-hdmi.conf index 079daa3a4..cc90bf57f 100644 --- a/tools/topology/topology2/cavs/cavs-gain-hdmi.conf +++ b/tools/topology/topology2/cavs/cavs-gain-hdmi.conf @@ -44,7 +44,6 @@ Object.Dai { stream_name iDisp1 period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -76,7 +75,6 @@ Object.Dai { stream_name iDisp2 period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -108,7 +106,6 @@ Object.Dai { stream_name iDisp3 period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch diff --git a/tools/topology/topology2/cavs/cavs-passthrough-hda.conf b/tools/topology/topology2/cavs/cavs-passthrough-hda.conf index 2aeccaaac..c6f9c0d35 100644 --- a/tools/topology/topology2/cavs/cavs-passthrough-hda.conf +++ b/tools/topology/topology2/cavs/cavs-passthrough-hda.conf @@ -16,7 +16,6 @@ Object.Dai { stream_name 'Analog Playback and Capture' period_sink_count 0 period_source_count 2 - format s32le event_flags 127 # trapping PRE/POST_PMU/PMD events event_type 2 # 1 for COPIER event for copier component node_type $HDA_LINK_OUTPUT_CLASS @@ -45,7 +44,6 @@ Object.Dai { dai_index 1 period_sink_count 2 period_source_count 0 - format s32le num_audio_formats 2 Object.Base.audio_format.1 { dma_buffer_size "$[$ibs * 2]" diff --git a/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf b/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf index 5c18bf737..c7c9b86e2 100644 --- a/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf +++ b/tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf @@ -47,7 +47,6 @@ Object.Dai { stream_name iDisp1 period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -78,7 +77,6 @@ Object.Dai { stream_name iDisp2 period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch @@ -109,7 +107,6 @@ Object.Dai { stream_name iDisp3 period_sink_count 0 period_source_count 2 - format s32le node_type $HDA_LINK_OUTPUT_CLASS num_audio_formats 2 # 16-bit 48KHz 2ch