This value is never set in machine drivers, no point in setting it here
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- topology/m4/local.m4 | 9 ++++----- topology/reef-apl-nocodec.m4 | 2 +- topology/reef-bdw-rt286.m4 | 2 +- topology/reef-bdw-rt5640.m4 | 2 +- topology/reef-bxt-nocodec.m4 | 2 +- topology/reef-byt-nocodec.m4 | 2 +- topology/reef-byt-rt5640.m4 | 2 +- topology/reef-byt-rt5651.m4 | 2 +- topology/reef-cht-nocodec.m4 | 2 +- topology/reef-hsw-rt5640.m4 | 2 +- topology/test-passthrough-16bit-48k-ssp2.m4 | 2 +- topology/test-passthrough-24bit-48k-src-ssp2.m4 | 2 +- topology/test-passthrough-24bit-48k-ssp2.m4 | 2 +- topology/test-passthrough-24bit-48k-vol-ssp2.m4 | 2 +- 14 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index e521267..e31ba0e 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -422,17 +422,17 @@ define(`DAI_TDM', dnl Pipeline name) define(`N_DAI_CONFIG', `DAICONFIG.'$1)
-dnl DAI_CONFIG(type, idx, name, sname, format, valid bits, mclk, bclk, fsync, tdm) +dnl DAI_CONFIG(type, idx, name, format, valid bits, mclk, bclk, fsync, tdm) define(`DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$2`"' -` format "'$5`"' +` format "'$4`"' `' +` '$6 ` '$7 ` '$8 ` '$9 -` '$10 `}' `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' ` tokens "sof_dai_tokens"' @@ -446,7 +446,7 @@ define(`DAI_CONFIG', `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' ` tokens "sof_dai_tokens"' ` tuples."word" {' -` SOF_TKN_DAI_SAMPLE_BITS' STR($6) +` SOF_TKN_DAI_SAMPLE_BITS' STR($5) ` }' `}' `SectionData."'N_DAI_CONFIG($1$2)`_data" {' @@ -456,7 +456,6 @@ define(`DAI_CONFIG', `SectionBE."'$3`" {' ` index "0"' `' -` stream_name "'$4`"' ` hw_configs [' ` "'$1$2`"' ` ]' diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index 96f28d5..b62d9ed 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -103,7 +103,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index 512efe9..16b5dd1 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -103,7 +103,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 5e259a6..f0071ee 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -103,7 +103,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index e3c45c9..ff506dd 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -103,7 +103,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 3db415d..17203f5 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -92,7 +92,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 1e9bb5f..3234b94 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -92,7 +92,7 @@ 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, Baytrail Audio, Audio, I2S, 24, +DAI_CONFIG(SSP, 2, Baytrail Audio, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index 0867f91..26ea742 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -92,7 +92,7 @@ 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, Baytrail Audio, Audio, I2S, 24, +DAI_CONFIG(SSP, 2, Baytrail Audio, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 195ae5c..908c037 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -92,7 +92,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 1b06828..13d073a 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -103,7 +103,7 @@ 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, I2S, 24, +DAI_CONFIG(SSP, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test-passthrough-16bit-48k-ssp2.m4 b/topology/test-passthrough-16bit-48k-ssp2.m4 index 197d8ad..bf4963b 100644 --- a/topology/test-passthrough-16bit-48k-ssp2.m4 +++ b/topology/test-passthrough-16bit-48k-ssp2.m4 @@ -47,7 +47,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-playback.m4, # # 16bit I2S using 20bit sample conatiner on SSP2 # -DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, TEST_DAI_LINK_STREAM_NAME, I2S, 16, +DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, I2S, 16, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 1920000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test-passthrough-24bit-48k-src-ssp2.m4 b/topology/test-passthrough-24bit-48k-src-ssp2.m4 index 5f88d7d..bcaed51 100644 --- a/topology/test-passthrough-24bit-48k-src-ssp2.m4 +++ b/topology/test-passthrough-24bit-48k-src-ssp2.m4 @@ -48,7 +48,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-src-playback.m4, # # 24bit I2S using 25bit sample conatiner on SSP2 # -DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, TEST_DAI_LINK_STREAM_NAME, I2S, 24, +DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test-passthrough-24bit-48k-ssp2.m4 b/topology/test-passthrough-24bit-48k-ssp2.m4 index 8ea4748..74c3b1a 100644 --- a/topology/test-passthrough-24bit-48k-ssp2.m4 +++ b/topology/test-passthrough-24bit-48k-ssp2.m4 @@ -47,7 +47,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-playback.m4, # # 24bit I2S using 25bit sample conatiner on SSP2 # -DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, TEST_DAI_LINK_STREAM_NAME, I2S, 24, +DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), diff --git a/topology/test-passthrough-24bit-48k-vol-ssp2.m4 b/topology/test-passthrough-24bit-48k-vol-ssp2.m4 index b1a0dab..3ff80fc 100644 --- a/topology/test-passthrough-24bit-48k-vol-ssp2.m4 +++ b/topology/test-passthrough-24bit-48k-vol-ssp2.m4 @@ -48,7 +48,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-passthrough-vol-playback.m4, # # 24bit I2S using 25bit sample conatiner on SSP2 # -DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, TEST_DAI_LINK_STREAM_NAME, I2S, 24, +DAI_CONFIG(SSP, 2, TEST_DAI_LINK_NAME, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave),