[Sound-open-firmware] [PATCH 1/7] [RFC]topology: separate ssp params from dai common params
Ranjani Sridharan
ranjani.sridharan at linux.intel.com
Tue May 22 09:01:01 CEST 2018
This patch makes changes to DAI config in topology to separate out
SSP specific params from common params in preparation for other
DAI types coming soon.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan at linux.intel.com>
---
topology/m4/dai.m4 | 44 +++++++++++++++----------
topology/sof-apl-nocodec.m4 | 11 ++++---
topology/sof-apl-tdf8532.m4 | 22 +++++++------
topology/sof-bdw-rt286.m4 | 11 ++++---
topology/sof-bdw-rt5640.m4 | 11 ++++---
topology/sof-byt-da7213.m4 | 11 ++++---
topology/sof-byt-nocodec.m4 | 11 ++++---
topology/sof-byt-rt5640.m4 | 11 ++++---
topology/sof-byt-rt5645.m4 | 11 ++++---
topology/sof-byt-rt5651.m4 | 11 ++++---
topology/sof-cht-max98090.m4 | 11 ++++---
topology/sof-cht-nocodec.m4 | 11 ++++---
topology/sof-cnl-rt274.m4 | 11 ++++---
topology/sof-hsw-rt5640.m4 | 11 ++++---
topology/test/test-capture-ssp.m4 | 13 +++++---
topology/test/test-playback-ssp.m4 | 13 +++++---
topology/test/test-ssp.m4 | 13 +++++---
topology/test/test-tone-playback-ssp.m4 | 13 +++++---
18 files changed, 142 insertions(+), 108 deletions(-)
diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4
index 0b030af..e635caf 100644
--- a/topology/m4/dai.m4
+++ b/topology/m4/dai.m4
@@ -131,27 +131,45 @@ define(`DAI_CLOCK',
dnl DAI_TDM(slots, width, tx_mask, rx_mask)
define(`DAI_TDM',
-` tdm_slots 'STR($1)
+`tdm_slots 'STR($1)
` tdm_slot_width 'STR($2)
` tx_slots 'STR($3)
` rx_slots 'STR($4)
)
+dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp sample bits)
+define(`SSP_CONFIG',
+` format "'$1`"'
+` '$2
+` '$3
+` '$4
+` '$5
+`}'
+$6
+)
+
+dnl SSP_SAMPLE_BITS(type, idx, valid bits)
+define(`SSP_SAMPLE_BITS',
+`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {'
+` tokens "sof_dai_tokens"'
+` tuples."word" {'
+` SOF_TKN_DAI_SAMPLE_BITS' STR($3)
+` }'
+`}'
+`SectionData."'N_DAI_CONFIG($1$2)`_data" {'
+` tuples "'N_DAI_CONFIG($1$2)`_tuples"'
+`}'
+)
dnl DAI Config)
define(`N_DAI_CONFIG', `DAICONFIG.'$1)
-dnl DAI_CONFIG(type, idx, name, format, valid bits, mclk, bclk, fsync, tdm)
+dnl DAI_CONFIG(type, idx, name, ssp_config)
define(`DAI_CONFIG',
`SectionHWConfig."'$1$2`" {'
`'
` id "'$2`"'
-` format "'$4`"'
`'
-` '$6
-` '$7
-` '$8
-` '$9
-`}'
+` ifelse($1, `SSP', $4, `}')'
`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {'
` tokens "sof_dai_tokens"'
` tuples."string" {'
@@ -161,16 +179,6 @@ define(`DAI_CONFIG',
`SectionData."'N_DAI_CONFIG($1$2)`_data_str" {'
` tuples "'N_DAI_CONFIG($1$2)`_tuples_str"'
`}'
-`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {'
-` tokens "sof_dai_tokens"'
-` tuples."word" {'
-` SOF_TKN_DAI_SAMPLE_BITS' STR($5)
-` }'
-`}'
-`SectionData."'N_DAI_CONFIG($1$2)`_data" {'
-` tuples "'N_DAI_CONFIG($1$2)`_tuples"'
-`}'
-`'
`SectionBE."'$3`" {'
` index "0"'
` default_hw_conf_id "'$2`"'
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
index 9c4286b..bc72332 100644
--- a/topology/sof-apl-nocodec.m4
+++ b/topology/sof-apl-nocodec.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, NoCodec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, NoCodec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4
index 1ff0a0d..74309a2 100644
--- a/topology/sof-apl-tdf8532.m4
+++ b/topology/sof-apl-tdf8532.m4
@@ -76,14 +76,16 @@ PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 4, SSP4-Codec, DSP_B, 32,
- DAI_CLOCK(mclk, 24576000, codec_mclk_in),
- DAI_CLOCK(bclk, 12288000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(8, 32, 15, 15))
+DAI_CONFIG(SSP, 4, SSP4-Codec,
+ SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
+ DAI_CLOCK(bclk, 12288000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(8, 32, 15, 15),
+ SSP_SAMPLE_BITS(SSP, 4, 32)))
-DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16,
- DAI_CLOCK(mclk, 24576000, codec_mclk_in),
- DAI_CLOCK(bclk, 1536000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 16, 3, 3))
+DAI_CONFIG(SSP, 2, SSP2-Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
+ DAI_CLOCK(bclk, 1536000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 16, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 16)))
diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4
index a13a49c..1111556 100644
--- a/topology/sof-bdw-rt286.m4
+++ b/topology/sof-bdw-rt286.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 0, Codec, I2S, 24,
- DAI_CLOCK(mclk, 24000000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 0, Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 0, 24)))
diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4
index 007944a..95b5c96 100644
--- a/topology/sof-bdw-rt5640.m4
+++ b/topology/sof-bdw-rt5640.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 0, Codec, I2S, 24,
- DAI_CLOCK(mclk, 24000000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 0, Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 0, 24)))
diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4
index ecf90c6..a741663 100644
--- a/topology/sof-byt-da7213.m4
+++ b/topology/sof-byt-da7213.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, SSP2-Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4
index efa321b..e8bc380 100644
--- a/topology/sof-byt-nocodec.m4
+++ b/topology/sof-byt-nocodec.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, NoCodec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, NoCodec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4
index ae54969..73deaca 100644
--- a/topology/sof-byt-rt5640.m4
+++ b/topology/sof-byt-rt5640.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, SSP2-Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4
index 364121f..0c28ab6 100644
--- a/topology/sof-byt-rt5645.m4
+++ b/topology/sof-byt-rt5645.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, SSP2-Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4
index be3d994..3872b2f 100644
--- a/topology/sof-byt-rt5651.m4
+++ b/topology/sof-byt-rt5651.m4
@@ -93,9 +93,10 @@ PCM_DUPLEX_ADD(Low Latency, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, SSP2-Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4
index 7ba4df7..85ba0cd 100644
--- a/topology/sof-cht-max98090.m4
+++ b/topology/sof-cht-max98090.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 1920000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 20, 3, 3))
+DAI_CONFIG(SSP, 2, SSP2-Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 1920000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 20, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 16)))
diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4
index a0eb9cd..a76c59f 100644
--- a/topology/sof-cht-nocodec.m4
+++ b/topology/sof-cht-nocodec.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 2, NoCodec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 2, NoCodec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 2, 24)))
diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4
index 89d5a25..6e11e97 100644
--- a/topology/sof-cnl-rt274.m4
+++ b/topology/sof-cnl-rt274.m4
@@ -64,8 +64,9 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 0, SSP0-Codec, DSP_B, 24,
- DAI_CLOCK(mclk, 24000000, codec_mclk_in),
- DAI_CLOCK(bclk, 4800000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(4, 25, 3, 3))
+DAI_CONFIG(SSP, 0, SSP0-Codec,
+ SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
+ DAI_CLOCK(bclk, 4800000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(4, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 0, 24)))
diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4
index 85b8209..3c3a6d2 100644
--- a/topology/sof-hsw-rt5640.m4
+++ b/topology/sof-hsw-rt5640.m4
@@ -93,8 +93,9 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# BE configurations - overrides config in ACPI if present
#
-DAI_CONFIG(SSP, 0, Codec, I2S, 24,
- DAI_CLOCK(mclk, 24000000, codec_mclk_in),
- DAI_CLOCK(bclk, 2400000, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, 25, 3, 3))
+DAI_CONFIG(SSP, 0, Codec,
+ SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
+ DAI_CLOCK(bclk, 2400000, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, 25, 3, 3),
+ SSP_SAMPLE_BITS(SSP, 0, 24)))
diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4
index 6d666dc..af486ab 100644
--- a/topology/test/test-capture-ssp.m4
+++ b/topology/test/test-capture-ssp.m4
@@ -68,8 +68,11 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2)
#
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
#
-DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
- DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
- DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3))
+DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+ SSP_CONFIG(TEST_SSP_MODE,
+ DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
+ DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+ SSP_SAMPLE_BITS(TEST_DAI_TYPE, TEST_DAI_PORT,
+ TEST_SSP_DATA_BITS)))
diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4
index 5ee1b53..a2068fe 100644
--- a/topology/test/test-playback-ssp.m4
+++ b/topology/test/test-playback-ssp.m4
@@ -68,8 +68,11 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1)
#
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
#
-DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
- DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave),
- DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3))
+DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+ SSP_CONFIG(TEST_SSP_MODE,
+ DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave),
+ DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+ SSP_SAMPLE_BITS(TEST_DAI_TYPE, TEST_DAI_PORT,
+ TEST_SSP_DATA_BITS)))
diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4
index 1bdce2f..b121e9a 100644
--- a/topology/test/test-ssp.m4
+++ b/topology/test/test-ssp.m4
@@ -86,8 +86,11 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
#
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
#
-DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS,
- DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
- DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3))
+DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+ SSP_CONFIG(TEST_SSP_MODE,
+ DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
+ DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+ SSP_SAMPLE_BITS(TEST_DAI_TYPE, TEST_DAI_PORT,
+ TEST_SSP_DATA_BITS)))
diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4
index 069ad64..6dba1fd 100644
--- a/topology/test/test-tone-playback-ssp.m4
+++ b/topology/test/test-tone-playback-ssp.m4
@@ -56,8 +56,11 @@ DAI_ADD(sof/pipe-dai-playback.m4,
#
# TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT
#
-DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS,
- DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
- DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
- DAI_CLOCK(fsync, 48000, codec_slave),
- DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3))
+DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, TEST_DAI_LINK_NAME,
+ SSP_CONFIG(TEST_SSP_MODE,
+ DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
+ DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+ DAI_CLOCK(fsync, 48000, codec_slave),
+ DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+ SSP_SAMPLE_BITS(TEST_DAI_TYPE, TEST_DAI_PORT,
+ TEST_SSP_DATA_BITS)))
--
2.17.0
More information about the Sound-open-firmware
mailing list