Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

Commit e77a8ef

Browse files
ranj063lrgirdwo
ranj063
authored and
lrgirdwo
committed
topology: scripts: changes to accommodate different DAI types
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>
1 parent 21f5234 commit e77a8ef

5 files changed

Lines changed: 121 additions & 107 deletions

File tree

‎topology/test/test-capture-ssp.m4‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
2121
#
2222
# TEST_PIPE_NAME - Pipe name
2323
# TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
24-
# TEST_SSP_PORT - SSP port number e.g. 2
25-
# TEST_SSP_FORMAT - SSP data format e.g s16le
24+
# TEST_DAI_PORT - SSP port number e.g. 2
25+
# TEST_DAI_FORMAT - SSP data format e.g s16le
2626
# TEST_PIPE_FORMAT - Pipeline format e.g. s16le
2727
# TEST_SSP_MCLK - SSP MCLK in Hz
2828
# TEST_SSP_BCLK - SSP BCLK in Hz
@@ -34,7 +34,7 @@ include(`dsps/byt.m4')
3434
#
3535
# Define the pipeline
3636
#
37-
# PCM0 <---> SSP TEST_SSP_PORT
37+
# PCM0 <---> SSP TEST_DAI_PORT
3838
#
3939

4040
# Passthrough playback pipeline 2 on PCM 0 using max 2 channels of s24le.
@@ -44,18 +44,18 @@ include(`dsps/byt.m4')
4444
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
4545
2, 0, 2, TEST_PIPE_FORMAT,
4646
48, 1000, 0, 0, 0, 1,
47-
SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
47+
TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
4848

4949
#
5050
# DAI configuration
5151
#
52-
# SSP port TEST_SSP_PORT is our only pipeline DAI
52+
# SSP port TEST_DAI_PORT is our only pipeline DAI
5353
#
54-
# capture DAI is SSP TEST_SSP_PORT using 2 periods
54+
# capture DAI is SSP TEST_DAI_PORT using 2 periods
5555
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
5656
DAI_ADD(sof/pipe-dai-capture.m4,
57-
2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
58-
PIPELINE_SINK_2, 2, TEST_SSP_FORMAT,
57+
2, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
58+
PIPELINE_SINK_2, 2, TEST_DAI_FORMAT,
5959
48, 1000, 0, 0)
6060

6161
# PCM Passthrough
@@ -66,7 +66,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2)
6666
#
6767
# Clocks masters wrt codec
6868
#
69-
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
69+
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
7070
#
7171
DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
7272
DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),

‎topology/test/test-playback-ssp.m4‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
2121
#
2222
# TEST_PIPE_NAME - Pipe name
2323
# TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
24-
# TEST_SSP_PORT - SSP port number e.g. 2
25-
# TEST_SSP_FORMAT - SSP data format e.g s16le
24+
# TEST_DAI_PORT - SSP port number e.g. 2
25+
# TEST_DAI_FORMAT - SSP data format e.g s16le
2626
# TEST_PIPE_FORMAT - Pipeline format e.g. s16le
2727
# TEST_SSP_MCLK - SSP MCLK in Hz
2828
# TEST_SSP_BCLK - SSP BCLK in Hz
@@ -34,7 +34,7 @@ include(`dsps/byt.m4')
3434
#
3535
# Define the pipeline
3636
#
37-
# PCM0 <---> SSP TEST_SSP_PORT
37+
# PCM0 <---> SSP TEST_DAI_PORT
3838
#
3939

4040
# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
@@ -44,18 +44,18 @@ include(`dsps/byt.m4')
4444
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
4545
1, 0, 2, TEST_PIPE_FORMAT,
4646
48, 1000, 0, 0, 0, 1,
47-
SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
47+
TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
4848
#
4949
# DAI configuration
5050
#
51-
# SSP port TEST_SSP_PORT is our only pipeline DAI
51+
# SSP port TEST_DAI_PORT is our only pipeline DAI
5252
#
5353

54-
# playback DAI is SSP TEST_SSP_PORT using 2 periods
54+
# playback DAI is SSP TEST_DAI_PORT using 2 periods
5555
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
5656
DAI_ADD(sof/pipe-dai-playback.m4,
57-
1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
58-
PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT,
57+
1, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
58+
PIPELINE_SOURCE_1, 2, TEST_DAI_FORMAT,
5959
48, 1000, 0, 0)
6060

6161
# PCM Passthrough
@@ -66,7 +66,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1)
6666
#
6767
# Clocks masters wrt codec
6868
#
69-
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
69+
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
7070
#
7171
DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
7272
DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave),

‎topology/test/test-ssp.m4‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
2121
#
2222
# TEST_PIPE_NAME - Pipe name
2323
# TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
24-
# TEST_SSP_PORT - SSP port number e.g. 2
25-
# TEST_SSP_FORMAT - SSP data format e.g s16le
24+
# TEST_DAI_PORT - SSP port number e.g. 2
25+
# TEST_DAI_FORMAT - SSP data format e.g s16le
2626
# TEST_PIPE_FORMAT - Pipeline format e.g. s16le
2727
# TEST_SSP_MCLK - SSP BCLK in Hz
2828
# TEST_SSP_BCLK - SSP BCLK in Hz
@@ -34,7 +34,7 @@ include(`dsps/byt.m4')
3434
#
3535
# Define the pipeline
3636
#
37-
# PCM0 <-- TEST_PIPE_NAME pipe --> SSP TEST_SSP_PORT
37+
# PCM0 <-- TEST_PIPE_NAME pipe --> SSP TEST_DAI_PORT
3838
#
3939

4040
# Passthrough playback pipeline 1 on PCM 0 using max 2 channels of s24le.
@@ -44,7 +44,7 @@ include(`dsps/byt.m4')
4444
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
4545
1, 0, 2, TEST_PIPE_FORMAT,
4646
48, 1000, 0, 0, 0, 1,
47-
SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
47+
TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
4848

4949

5050
# 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,
5454
PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4,
5555
2, 0, 2, TEST_PIPE_FORMAT,
5656
48, 1000, 0, 0, 0, 1,
57-
SSP, TEST_SSP_PORT, TEST_SSP_FORMAT, 2)
57+
TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_FORMAT, 2)
5858

5959
#
6060
# DAI configuration
6161
#
62-
# SSP port TEST_SSP_PORT is our only pipeline DAI
62+
# SSP port TEST_DAI_PORT is our only pipeline DAI
6363
#
6464

65-
# playback DAI is SSP TEST_SSP_PORT using 2 periods
65+
# playback DAI is SSP TEST_DAI_PORT using 2 periods
6666
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
6767
DAI_ADD(sof/pipe-dai-playback.m4,
68-
1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
69-
PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT,
68+
1, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
69+
PIPELINE_SOURCE_1, 2, TEST_DAI_FORMAT,
7070
48, 1000, 0, 0)
7171

72-
# capture DAI is SSP TEST_SSP_PORT using 2 periods
72+
# capture DAI is SSP TEST_DAI_PORT using 2 periods
7373
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
7474
DAI_ADD(sof/pipe-dai-capture.m4,
75-
2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
76-
PIPELINE_SINK_2, 2, TEST_SSP_FORMAT,
75+
2, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
76+
PIPELINE_SINK_2, 2, TEST_DAI_FORMAT,
7777
48, 1000, 0, 0)
7878

7979
# PCM Passthrough
@@ -84,7 +84,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
8484
#
8585
# Clocks masters wrt codec
8686
#
87-
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
87+
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
8888
#
8989
DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
9090
DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),

‎topology/test/test-tone-playback-ssp.m4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ include(`dsps/byt.m4')
2121
#
2222
# TEST_PIPE_NAME - Pipe name
2323
# TEST_DAI_LINK_NAME - BE DAI link name e.g. "NoCodec"
24-
# TEST_SSP_PORT - SSP port number e.g. 2
25-
# TEST_SSP_FORMAT - SSP data format e.g s16le
24+
# TEST_DAI_PORT - SSP port number e.g. 2
25+
# TEST_DAI_FORMAT - SSP data format e.g s16le
2626
# TEST_PIPE_FORMAT - Pipeline format e.g. s16le
2727
# TEST_SSP_MCLK - SSP MCLK in Hz
2828
# TEST_SSP_BCLK - SSP BCLK in Hz
@@ -43,18 +43,18 @@ PIPELINE_ADD(sof/pipe-tone.m4,
4343
48, 1000, 0, 0)
4444

4545
# playback DAI is SSP2 using 2 periods
46-
# Buffers use TEST_SSP_FORMAT format, with 48 frame per 1000us on core 0 with priority 0
46+
# Buffers use TEST_DAI_FORMAT format, with 48 frame per 1000us on core 0 with priority 0
4747
DAI_ADD(sof/pipe-dai-playback.m4,
48-
5, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME,
49-
PIPELINE_SOURCE_5, 2, TEST_SSP_FORMAT,
48+
5, TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
49+
PIPELINE_SOURCE_5, 2, TEST_DAI_FORMAT,
5050
48, 1000, 2, 0)
5151

5252
#
5353
# BE configurations - overrides config in ACPI if present
5454
#
5555
# Clocks masters wrt codec
5656
#
57-
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
57+
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_DAI_PORT
5858
#
5959
DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS,
6060
DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),

0 commit comments

Comments
 (0)