From 73cf4c0bc7f542bf8435bb1ca0b14165c2a45a16 Mon Sep 17 00:00:00 2001 From: Pan Xiuli Date: Mon, 27 Jul 2020 16:04:43 +0800 Subject: [PATCH] topology: sof: use pipeline ID in demux control name To make multiple DEMUX comp can work in same topology. Add pipeline ID into the DEMUX control name. Signed-off-by: Pan Xiuli --- tools/topology/sof-apl-demux-pcm512x.m4 | 2 +- tools/topology/sof-cml-demux-rt5682.m4 | 2 +- tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 | 2 +- tools/topology/sof-tgl-max98357a-rt5682.m4 | 2 +- tools/topology/sof/pipe-volume-demux-playback.m4 | 7 +++---- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/topology/sof-apl-demux-pcm512x.m4 b/tools/topology/sof-apl-demux-pcm512x.m4 index 642269827..dd185a137 100644 --- a/tools/topology/sof-apl-demux-pcm512x.m4 +++ b/tools/topology/sof-apl-demux-pcm512x.m4 @@ -49,7 +49,7 @@ define(matrix2, `ROUTE_MATRIX(5, `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')') dnl name, num_streams, route_matrix list -MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2')) +MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2')) # # Define the pipelines diff --git a/tools/topology/sof-cml-demux-rt5682.m4 b/tools/topology/sof-cml-demux-rt5682.m4 index 3ea8b03d4..0d9f910ba 100644 --- a/tools/topology/sof-cml-demux-rt5682.m4 +++ b/tools/topology/sof-cml-demux-rt5682.m4 @@ -49,7 +49,7 @@ define(matrix2, `ROUTE_MATRIX(5, `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')') dnl name, num_streams, route_matrix list -MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2')) +MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2')) # # Define the pipelines diff --git a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 index 4d0927025..1bbb86eff 100644 --- a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -51,7 +51,7 @@ define(matrix2, `ROUTE_MATRIX(4, `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')') dnl name, num_streams, route_matrix list -MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2')) +MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2')) ') # diff --git a/tools/topology/sof-tgl-max98357a-rt5682.m4 b/tools/topology/sof-tgl-max98357a-rt5682.m4 index 989f1afa2..17a434a22 100644 --- a/tools/topology/sof-tgl-max98357a-rt5682.m4 +++ b/tools/topology/sof-tgl-max98357a-rt5682.m4 @@ -52,7 +52,7 @@ define(matrix2, `ROUTE_MATRIX(9, `BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')') dnl name, num_streams, route_matrix list -MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2')) +MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2')) # # Define the pipelines diff --git a/tools/topology/sof/pipe-volume-demux-playback.m4 b/tools/topology/sof/pipe-volume-demux-playback.m4 index 20fe40b9a..61dc883e9 100644 --- a/tools/topology/sof/pipe-volume-demux-playback.m4 +++ b/tools/topology/sof/pipe-volume-demux-playback.m4 @@ -23,13 +23,12 @@ include(`mixercontrol.m4') include(`bytecontrol.m4') # demux Bytes control with max value of 255 -C_CONTROLBYTES(DEMUX, PIPELINE_ID, +C_CONTROLBYTES(concat(`DEMUX', PIPELINE_ID), PIPELINE_ID, CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258, 258), CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get/put handlers, 258, 258), , , , CONTROLBYTES_MAX(, 304), - , - demux_priv) + , concat(`demux_priv_', PIPELINE_ID)) # Volume Mixer control with max value of 32 C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, @@ -64,7 +63,7 @@ W_PGA(1, PIPELINE_FORMAT, DAI_PERIODS, 2, playback_pga_conf, SCHEDULE_CORE, # Mux 0 has 2 sink and source periods. W_MUXDEMUX(0, 1, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE, - LIST(` ', "DEMUX")) + LIST(` ', concat(`DEMUX', PIPELINE_ID))) # Low Latency Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2,