[Sound-open-firmware] [PATCH v5 1/7] topology: scripts: changes to accommodate different DAI types

31 May 2018

This patch makes the following changes to make way for handling
different DAI types in tplg build script:
1. Define the test DAI type while processing m4 files
2. DAI format and DAI port might be relevant for other types of DAI's.
So use generic TEST_DAI_PORT and TEST_DAI_FORMAT instead of
TEST_SSP_PORT TEST_SSP_FORMAT
Signed-off-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com
---
 topology/test/test-capture-ssp.m4       |  18 +--
 topology/test/test-playback-ssp.m4      |  18 +--
 topology/test/test-ssp.m4               |  26 ++--
 topology/test/test-tone-playback-ssp.m4 |  12 +-
 topology/test/tplg-build.sh             | 154 +++++++++++++-----------
 5 files changed, 121 insertions(+), 107 deletions(-)

diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4
index 67f0da9..b6f0935 100644
--- a/topology/test/test-capture-ssp.m4
+++ b/topology/test/test-capture-ssp.m4
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
 #
 # TEST_PIPE_NAME - Pipe name
 # TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
-# TEST_SSP_PORT	- SSP port number e.g. 2
-# TEST_SSP_FORMAT - SSP data format e.g s16le
+# TEST_DAI_PORT	- SSP port number e.g. 2
+# TEST_DAI_FORMAT - SSP data format e.g s16le
 # TEST_PIPE_FORMAT - Pipeline format e.g. s16le
 # TEST_SSP_MCLK - SSP MCLK in Hz
 # TEST_SSP_BCLK - SSP BCLK in Hz
@@ -34,7 +34,7 @@ include(`dsps/byt.m4')
 #
 # Define the pipeline
 #
-# PCM0 <---> SSP TEST_SSP_PORT
+# PCM0 <---> SSP TEST_DAI_PORT
 #
# Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le.
@@ -44,18 +44,18 @@ include(`dsps/byt.m4')
 PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
    2, 0, 2, TEST_PIPE_FORMAT,
    48, 1000, 0, 0, 0, 1,
-	SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
+	TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
#
 # DAI configuration
 #
-# SSP port TEST_SSP_PORT is our only pipeline DAI
+# SSP port TEST_DAI_PORT is our only pipeline DAI
 #
-# capture DAI is SSP TEST_SSP_PORT using 2 periods
+# capture DAI is SSP TEST_DAI_PORT using 2 periods
 # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-capture.m4,
-	2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
-	PIPELINE_SINK_2, 2, TEST_SSP_FORMAT,
+	2, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+	PIPELINE_SINK_2, 2, TEST_DAI_FORMAT,
    48, 1000, 0, 0)
# PCM Passthrough
@@ -66,7 +66,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2)
 #
 # Clocks masters wrt codec
 #
-# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
+# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
 #
 DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
    DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4
index 22943b0..a12db57 100644
--- a/topology/test/test-playback-ssp.m4
+++ b/topology/test/test-playback-ssp.m4
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
 #
 # TEST_PIPE_NAME - Pipe name
 # TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
-# TEST_SSP_PORT	- SSP port number e.g. 2
-# TEST_SSP_FORMAT - SSP data format e.g s16le
+# TEST_DAI_PORT	- SSP port number e.g. 2
+# TEST_DAI_FORMAT - SSP data format e.g s16le
 # TEST_PIPE_FORMAT - Pipeline format e.g. s16le
 # TEST_SSP_MCLK - SSP MCLK in Hz
 # TEST_SSP_BCLK - SSP BCLK in Hz
@@ -34,7 +34,7 @@ include(`dsps/byt.m4')
 #
 # Define the pipeline
 #
-# PCM0 <---> SSP TEST_SSP_PORT
+# PCM0 <---> SSP TEST_DAI_PORT
 #
# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
@@ -44,18 +44,18 @@ include(`dsps/byt.m4')
 PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
    1, 0, 2, TEST_PIPE_FORMAT,
    48, 1000, 0, 0, 0, 1,
-	SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
+	TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
 #
 # DAI configuration
 #
-# SSP port TEST_SSP_PORT is our only pipeline DAI
+# SSP port TEST_DAI_PORT is our only pipeline DAI
 #
-# playback DAI is SSP TEST_SSP_PORT using 2 periods
+# playback DAI is SSP TEST_DAI_PORT using 2 periods
 # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-playback.m4,
-	1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
-	PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT,
+	1, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+	PIPELINE_SOURCE_1, 2, TEST_DAI_FORMAT,
    48, 1000, 0, 0)
# PCM Passthrough
@@ -66,7 +66,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1)
 #
 # Clocks masters wrt codec
 #
-# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
+# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
 #
 DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
    DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave),
diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4
index 0b305e1..05c6fee 100644
--- a/topology/test/test-ssp.m4
+++ b/topology/test/test-ssp.m4
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
 #
 # TEST_PIPE_NAME - Pipe name
 # TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
-# TEST_SSP_PORT	- SSP port number e.g. 2
-# TEST_SSP_FORMAT - SSP data format e.g s16le
+# TEST_DAI_PORT	- SSP port number e.g. 2
+# TEST_DAI_FORMAT - SSP data format e.g s16le
 # TEST_PIPE_FORMAT - Pipeline format e.g. s16le
 # TEST_SSP_MCLK - SSP BCLK in Hz
 # TEST_SSP_BCLK - SSP BCLK in Hz
@@ -34,7 +34,7 @@ include(`dsps/byt.m4')
 #
 # Define the pipeline
 #
-# PCM0 <-- TEST_PIPE_NAME pipe --> SSP TEST_SSP_PORT
+# PCM0 <-- TEST_PIPE_NAME pipe --> SSP TEST_DAI_PORT
 #
# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
@@ -44,7 +44,7 @@ include(`dsps/byt.m4')
 PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
    1, 0, 2, TEST_PIPE_FORMAT,
    48, 1000, 0, 0, 0, 1,
-	SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
+	TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
# Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le.
@@ -54,26 +54,26 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
 PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
    2, 0, 2, TEST_PIPE_FORMAT,
    48, 1000, 0, 0, 0, 1,
-	SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
+	TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
#
 # DAI configuration
 #
-# SSP port TEST_SSP_PORT is our only pipeline DAI
+# SSP port TEST_DAI_PORT is our only pipeline DAI
 #
-# playback DAI is SSP TEST_SSP_PORT using 2 periods
+# playback DAI is SSP TEST_DAI_PORT using 2 periods
 # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-playback.m4,
-	1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
-	PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT,
+	1, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+	PIPELINE_SOURCE_1, 2, TEST_DAI_FORMAT,
    48, 1000, 0, 0)
-# capture DAI is SSP TEST_SSP_PORT using 2 periods
+# capture DAI is SSP TEST_DAI_PORT using 2 periods
 # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-capture.m4,
-	2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
-	PIPELINE_SINK_2, 2, TEST_SSP_FORMAT,
+	2, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+	PIPELINE_SINK_2, 2, TEST_DAI_FORMAT,
    48, 1000, 0, 0)
# PCM Passthrough
@@ -84,7 +84,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 #
 # Clocks masters wrt codec
 #
-# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
+# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
 #
 DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
    DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4
index b08447a..a530354 100644
--- a/topology/test/test-tone-playback-ssp.m4
+++ b/topology/test/test-tone-playback-ssp.m4
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
 #
 # TEST_PIPE_NAME - Pipe name
 # TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
-# TEST_SSP_PORT	- SSP port number e.g. 2
-# TEST_SSP_FORMAT - SSP data format e.g s16le
+# TEST_DAI_PORT	- SSP port number e.g. 2
+# TEST_DAI_FORMAT - SSP data format e.g s16le
 # TEST_PIPE_FORMAT - Pipeline format e.g. s16le
 # TEST_SSP_MCLK - SSP MCLK in Hz
 # TEST_SSP_BCLK - SSP BCLK in Hz
@@ -43,10 +43,10 @@ PIPELINE_ADD(sof/pipe-tone.m4,
    48, 1000, 0, 0)
# playback DAI is SSP2 using 2 periods
-# Buffers use TEST_SSP_FORMAT format, with 48 frame per 1000us on core 0 with priority 0
+# Buffers use TEST_DAI_FORMAT format, with 48 frame per 1000us on core 0 with priority 0
 DAI_ADD(sof/pipe-dai-playback.m4,
-	5, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
-	PIPELINE_SOURCE_5, 2, TEST_SSP_FORMAT,
+	5, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+	PIPELINE_SOURCE_5, 2, TEST_DAI_FORMAT,
    48, 1000, 2, 0)
#
@@ -54,7 +54,7 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 #
 # Clocks masters wrt codec
 #
-# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
+# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
 #
 DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS,
    DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh
index af23b66..4c33819 100755
--- a/topology/test/tplg-build.sh
+++ b/topology/test/tplg-build.sh
@@ -14,6 +14,7 @@ export M4PATH="../:../m4:../common"
 # can be used on components with 1 sink and 1 source.
 SIMPLE_TESTS=(test-ssp test-capture-ssp test-playback-ssp)
 TONE_TEST=test-tone-playback-ssp
+DMIC_TEST=test-capture-ssp
 TEST_STRINGS=""
 M4_STRINGS=""
 # process m4 simple tests -
@@ -22,6 +23,7 @@ M4_STRINGS=""
 # 2) pipe_name - test component pipeline filename in sof/
 # 3) be_name - BE DAI link name in machine driver, used for matching
 # 4) format - PCM sample format
+# 5) dai_type - dai type e.g. SSP/DMIC
 # 5) dai_id - SSP port number
 # 6) dai_format - SSP sample format
 # 7) dai_phy_bits - SSP physical number of BLKCs per slot/channel
@@ -32,59 +34,71 @@ M4_STRINGS=""
 #
function simple_test {
-	TESTS=("${!12}")
+	if [ $5 == "SSP" ]
+	then
+		TESTS=("${!13}")
+	fi
    for i in ${TESTS[@]}
    do
-		TFILE="$i$5-${11}-$2-$4-$6-48k-$((${10} / 1000))k-$1"
+		TFILE="$i$6-${12}-$2-$4-$7-48k-$((${11} / 1000))k-$1"
    	if [ "$USE_XARGS" == "yes" ]
    	then
-			#create input string for batch m4 processing
-			M4_STRINGS+="-DTEST_PIPE_NAME=$2,-DTEST_DAI_LINK_NAME=$3\
-				-DTEST_SSP_PORT=$5,-DTEST_SSP_FORMAT=$6\
-				-DTEST_PIPE_FORMAT=$4,-DTEST_SSP_BCLK=$9\
-				-DTEST_SSP_MCLK=${10},-DTEST_SSP_PHY_BITS=$7\
-				-DTEST_SSP_DATA_BITS=$8,-DTEST_SSP_MODE=${11}\
-				$i.m4,${TFILE},"
-			#create input string for batch processing of conf files
-			TEST_STRINGS+=${TFILE}","
+			#if DAI type is SSP, define the SSP specific params
+			if [ $5 == "SSP" ]
+			then
+				#create input string for batch m4 processing
+				M4_STRINGS+="-DTEST_PIPE_NAME=$2,-DTEST_DAI_LINK_NAME=$3\
+					-DTEST_DAI_PORT=$6,-DTEST_DAI_FORMAT=$7\
+					-DTEST_PIPE_FORMAT=$4,-DTEST_SSP_BCLK=${10}\
+					-DTEST_SSP_MCLK=${11},-DTEST_SSP_PHY_BITS=$8\
+					-DTEST_SSP_DATA_BITS=$9,-DTEST_SSP_MODE=${12}\
+					-DTEST_DAI_TYPE=$5\
+					$i.m4,${TFILE},"
+				#create input string for batch processing of conf files
+				TEST_STRINGS+=${TFILE}","
+			fi
    	else
-			echo "M4 pre-processing test $i -> ${TFILE}"
-			m4 ${M4_FLAGS} \
-				-DTEST_PIPE_NAME="$2" \
-				-DTEST_DAI_LINK_NAME="$3" \
-				-DTEST_SSP_PORT=$5 \
-				-DTEST_SSP_FORMAT=$6 \
-				-DTEST_PIPE_FORMAT=$4 \
-				-DTEST_SSP_BCLK=$9 \
-				-DTEST_SSP_MCLK=${10} \
-				-DTEST_SSP_PHY_BITS=$7 \
-				-DTEST_SSP_DATA_BITS=$8 \
-				-DTEST_SSP_MODE=${11} \
-				$i.m4 > ${TFILE}.conf
-			echo "Compiling test $i -> ${TFILE}.tplg"
-			alsatplg -v 1 -c ${TFILE}.conf -o ${TFILE}.tplg
+			#if DAI type is SSP, define the SSP specific params
+			if [ $5 == "SSP" ]
+			then
+				echo "M4 pre-processing test $i -> ${TFILE}"
+				m4 ${M4_FLAGS} \
+					-DTEST_PIPE_NAME="$2" \
+					-DTEST_DAI_LINK_NAME="$3" \
+					-DTEST_DAI_PORT=$6 \
+					-DTEST_DAI_FORMAT=$7 \
+					-DTEST_PIPE_FORMAT=$4 \
+					-DTEST_SSP_BCLK=${10} \
+					-DTEST_SSP_MCLK=${11} \
+					-DTEST_SSP_PHY_BITS=$8 \
+					-DTEST_SSP_DATA_BITS=$9 \
+					-DTEST_SSP_MODE=${12} \
+					-DTEST_DAI_TYPE=$5 \
+					$i.m4 > ${TFILE}.conf
+				echo "Compiling test $i -> ${TFILE}.tplg"
+				alsatplg -v 1 -c ${TFILE}.conf -o ${TFILE}.tplg
+			fi
    	fi
-
    done
 }
echo "Preparing topology build input..."
# Pre-process the simple tests
-simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
-simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-
-simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
-simple_test codec passthrough "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-simple_test codec volume "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
-simple_test codec volume "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-simple_test codec volume "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
-simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
-simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test nocodec passthrough "NoCodec" s16le SSP 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
+simple_test nocodec passthrough "NoCodec" s24le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s16le SSP 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s24le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s16le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test nocodec src "NoCodec" s24le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+
+simple_test codec passthrough "SSP2-Codec" s16le SSP 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
+simple_test codec passthrough "SSP2-Codec" s24le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test codec volume "SSP2-Codec" s16le SSP 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
+simple_test codec volume "SSP2-Codec" s24le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test codec volume "SSP2-Codec" s24le SSP 2 s16le 20 16 1920000 19200000 I2S SIMPLE_TESTS[@]
+simple_test codec volume "SSP2-Codec" s16le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
+simple_test codec src "SSP2-Codec" s24le SSP 2 s24le 25 24 2400000 19200000 I2S SIMPLE_TESTS[@]
# for APL
 APL_PROTOCOL_TESTS=(I2S LEFT_J DSP_A DSP_B)
@@ -100,22 +114,22 @@ do
    	do
    		for format in ${APL_FORMAT_TESTS[@]}
    		do
-				simple_test nocodec $mode "NoCodec" $format $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
-				simple_test nocodec $mode "NoCodec" $format $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
-				simple_test nocodec $mode "NoCodec" $format $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
+				simple_test nocodec $mode "NoCodec" $format SSP $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
+				simple_test nocodec $mode "NoCodec" $format SSP $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
+				simple_test nocodec $mode "NoCodec" $format SSP $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
-				simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
-				simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
-				simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
+				simple_test codec $mode "SSP${ssp}-Codec" $format SSP $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
+				simple_test codec $mode "SSP${ssp}-Codec" $format SSP $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
+				simple_test codec $mode "SSP${ssp}-Codec" $format SSP $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
    		done
    	done
-		simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
-		simple_test nocodec passthrough "NoCodec" s24le $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
-		simple_test nocodec passthrough "NoCodec" s32le $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
+		simple_test nocodec passthrough "NoCodec" s16le SSP $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
+		simple_test nocodec passthrough "NoCodec" s24le SSP $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
+		simple_test nocodec passthrough "NoCodec" s32le SSP $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
-		simple_test codec passthrough "SSP${ssp}-Codec" s16le $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
-		simple_test codec passthrough "SSP${ssp}-Codec"	s24le $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
-		simple_test codec passthrough "SSP${ssp}-Codec"	s32le $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
+		simple_test codec passthrough "SSP${ssp}-Codec" s16le SSP $ssp s16le 16 16 1536000 24576000 $protocol SIMPLE_TESTS[@]
+		simple_test codec passthrough "SSP${ssp}-Codec"	s24le SSP $ssp s24le 32 24 3072000 24576000 $protocol SIMPLE_TESTS[@]
+		simple_test codec passthrough "SSP${ssp}-Codec"	s32le SSP $ssp s32le 32 32 3072000 24576000 $protocol SIMPLE_TESTS[@]
    done
 done
@@ -127,39 +141,39 @@ do
    	do
    		for format in ${APL_FORMAT_TESTS[@]}
    		do
-				simple_test nocodec $mode "NoCodec" $format $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
-				simple_test nocodec $mode "NoCodec" $format $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
+				simple_test nocodec $mode "NoCodec" $format SSP $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
+				simple_test nocodec $mode "NoCodec" $format SSP $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
-				simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
-				simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
+				simple_test codec $mode "SSP${ssp}-Codec" $format SSP $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
+				simple_test codec $mode "SSP${ssp}-Codec" $format SSP $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
    		done
    	done
-		simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
-		simple_test nocodec passthrough "NoCodec" s24le $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
+		simple_test nocodec passthrough "NoCodec" s16le SSP $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
+		simple_test nocodec passthrough "NoCodec" s24le SSP $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
-		simple_test codec passthrough "SSP${ssp}-Codec" s16le $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
-		simple_test codec passthrough "SSP${ssp}-Codec" s24le $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
+		simple_test codec passthrough "SSP${ssp}-Codec" s16le SSP $ssp s16le 20 16 1920000 19200000 $protocol SIMPLE_TESTS[@]
+		simple_test codec passthrough "SSP${ssp}-Codec" s24le SSP $ssp s24le 25 24 2400000 19200000 $protocol SIMPLE_TESTS[@]
    done
 done
# for CNL
-simple_test nocodec passthrough "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S SIMPLE_TESTS[@]
-simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
-simple_test nocodec volume "NoCodec" s24le 2 s16le 25 16 2400000 24000000 I2S SIMPLE_TESTS[@]
-simple_test nocodec src "NoCodec" s24le 4 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec passthrough "NoCodec" s16le SSP 2 s16le 25 16 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec passthrough "NoCodec" s24le SSP 2 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s16le SSP 2 s16le 25 16 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s16le SSP 2 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s24le SSP 2 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec volume "NoCodec" s24le SSP 2 s16le 25 16 2400000 24000000 I2S SIMPLE_TESTS[@]
+simple_test nocodec src "NoCodec" s24le SSP 4 s24le 25 24 2400000 24000000 I2S SIMPLE_TESTS[@]
# Tone test: Tone component only supports s32le currently
-simple_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000 I2S TONE_TEST[@]
+simple_test codec tone "SSP2-Codec" s32le SSP 2 s16le 20 16 1920000 19200000 I2S TONE_TEST[@]
if [ "$USE_XARGS" == "yes" ]
 then
    echo "Batch processing m4 files..."
    M4_STRINGS=${M4_STRINGS%?}
    #m4 processing
-	echo $M4_STRINGS | tr " " "," | tr '\n' '\0' | xargs -P0 -d ',' -n12 bash -c 'm4 "${@:1:${#}-1}" > ${12}.conf' m4
+	echo $M4_STRINGS | tr " " "," | tr '\n' '\0' | xargs -P0 -d ',' -n13 bash -c 'm4 "${@:1:${#}-1}" > ${13}.conf' m4
#execute alsatplg to create topology binary
    TEST_STRINGS=${TEST_STRINGS%?}
-- 
2.17.0


    