April 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] upstream SOF binary to firmware repo
by Li, Jocelyn 24 Apr '18

24 Apr '18

Hi, Should we upstream SOF binary to upstream firmware repo, so as to make firmware binary integration easier for Linux distributions? What is our insight here? Thanks, Jocelyn

3 2

[Sound-open-firmware] [PATCH] dist: fix make dist compiling issue
by Zhang Keqiao 24 Apr '18

24 Apr '18

Signed-off-by: Zhang Keqiao <keqiao.zhang(a)linux.intel.com> --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 200c55b..dec56ef 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST=sof_uapi.doxygen +EXTRA_DIST=sof_uapi.doxygen.in AM_CPPFLAGS=-I$(top_srcdir)/include -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] FIX: Remove unused variable.
by yan.wang＠linux.intel.com 24 Apr '18

24 Apr '18

From: Yan Wang <yan.wang(a)linux.intel.com> The variable "i" shouldn't be used. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF master: 29d4e8b1260e44004baad937d661bcc45fe05e81 SOF-Tool master: 8e8cd884c36e297f5996a7bb4f1e830a0f1ee84c https://github.com/plbossart/sound/tree/topic/sof-v4.14: 2cd03d26b66f8fee25b8b21ea3f60db11def5b13 --- rimage/file_simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rimage/file_simple.c b/rimage/file_simple.c index a9f22d0..4068734 100644 --- a/rimage/file_simple.c +++ b/rimage/file_simple.c @@ -259,7 +259,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) { struct snd_sof_mod_hdr hdr; size_t count; - int i, err; + int err; hdr.num_blocks = 1; hdr.size = module->text_size + module->data_size; @@ -288,7 +288,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) err = write_block_reloc(image, module); if (err < 0) { - fprintf(stderr, "error: failed to write section #%d\n", i); + fprintf(stderr, "error: failed to write section #%d\n", err); return err; } -- 2.14.3

5 4

[Sound-open-firmware] [PATCH] klockwork: fix one uninitialized issue
by Zhang Keqiao 20 Apr '18

20 Apr '18

From: Zhang Keqiao <keqiao.zhang(a)intel.com> Signed-off-by: Zhang Keqiao <keqiao.zhang(a)intel.com> --- rimage/file_simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rimage/file_simple.c b/rimage/file_simple.c index a9f22d0..6402b2e 100644 --- a/rimage/file_simple.c +++ b/rimage/file_simple.c @@ -259,7 +259,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) { struct snd_sof_mod_hdr hdr; size_t count; - int i, err; + int err; hdr.num_blocks = 1; hdr.size = module->text_size + module->data_size; @@ -288,7 +288,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) err = write_block_reloc(image, module); if (err < 0) { - fprintf(stderr, "error: failed to write section #%d\n", i); + fprintf(stderr, "error: failed to write section\n"); return err; } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] kmod_scripts: handle nocodec machine driver
by Pierre-Louis Bossart 14 Apr '18

14 Apr '18

make sure it's removed Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- kmod_scripts/sof_remove.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/kmod_scripts/sof_remove.sh b/kmod_scripts/sof_remove.sh index 1ea0598..74b94d5 100755 --- a/kmod_scripts/sof_remove.sh +++ b/kmod_scripts/sof_remove.sh @@ -16,6 +16,7 @@ rmmod snd_soc_sst_bytcr_rt5651 rmmod snd_soc_sst_cht_bsw_rt5645 rmmod snd_soc_sst_cht_bsw_rt5670 rmmod snd_soc_sst_byt_cht_da7213 +rmmod snd_sof_nocodec rmmod snd_soc_rt5670 rmmod snd_soc_rt5645 -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: test: fix APL test loops
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Copy/paste mistake, fix. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/test/tplg-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 4a4348f..7c55fba 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -144,8 +144,8 @@ do simple_test nocodec $mode "NoCodec" $format $ssp s16le 20 16 1920000 19200000 $protocol simple_test nocodec $mode "NoCodec" $format $ssp s24le 25 24 2400000 19200000 $protocol - simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol - simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol done done simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 20 16 1920000 19200000 $protocol -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] apl-ssp: use macros instead of hard-coded shifts/masks
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Missed those definitions in previous patch, fix. Suggested-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/apl-ssp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 8f9bc14..6e33656 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -359,8 +359,9 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - sspsp |= SSPSP_EDMYSTOP((slot_end_padding >> 2) & 0x3); - sspsp |= SSPSP_DMYSTOP(slot_end_padding & 0x3); + sspsp |= SSPSP_DMYSTOP(slot_end_padding & SSPSP_DMYSTOP_MASK); + slot_end_padding >>= SSPSP_DMYSTOP_BITS; + sspsp |= SSPSP_EDMYSTOP(slot_end_padding & SSPSP_EDMYSTOP_MASK); break; @@ -409,8 +410,9 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - sspsp |= SSPSP_EDMYSTOP((slot_end_padding >> 2) & 0x3); - sspsp |= SSPSP_DMYSTOP(slot_end_padding & 0x3); + sspsp |= SSPSP_DMYSTOP(slot_end_padding & SSPSP_DMYSTOP_MASK); + slot_end_padding >>= SSPSP_DMYSTOP_BITS; + sspsp |= SSPSP_EDMYSTOP(slot_end_padding & SSPSP_EDMYSTOP_MASK); break; case SOF_DAI_FMT_DSP_A: -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] scripts: checkpatch: don't complain about volatile
by Xiuli Pan 13 Apr '18

13 Apr '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/checkpatch.pl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 16d035e..6afecfe 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -5189,13 +5189,6 @@ sub process { } } -# no volatiles please - my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b}; - if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) { - WARN("VOLATILE", - "Use of volatile is usually wrong: see Documentation/process/volatile-considered-harmful.rst\n" . $herecurr); - } - # Check for user-visible strings broken across lines, which breaks the ability # to grep for the string. Make exceptions when the previous string ends in a # newline (multiple lines in one string constant) or '\t', '\r', ';', or '{' -- 2.7.4

5 5

[Sound-open-firmware] [PATCH] topology: test: generate more configurations for ApolloLake
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Disk space is cheap, life is short, let's just brute-force generate all the combinations supported on SSP. Testers should just pick from the generated configurations instead of adding their own changes to the tplg-build.sh file. Passthrough is special-cased since pipeline and DAI format need to match. The frequencies and DAI formats remain in clear-text and duplicated, we could optimize further but then it'd become unmaintainable. Next step is to add slave mode and make the frame rate vary. If this is deemed to heavy, we can define a 'make test' target to avoid generating all these files by default. Alternatively people can select the modes needed by just changing the APL_ arrays. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/test/tplg-build.sh | 71 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index ff2d144..4a4348f 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -34,7 +34,7 @@ TONE_TEST=test-tone-playback-ssp function simple_test { for i in ${SIMPLE_TESTS[@]} do - TFILE="$i$5-${11}-$2-$4-$6-48k-$1" + TFILE="$i$5-${11}-$2-$4-$6-48k-$((${10} / 1000))k-$1" echo "M4 pre-processing test $i -> ${TFILE}" m4 ${M4_FLAGS} \ -DTEST_PIPE_NAME="$2" \ @@ -101,21 +101,60 @@ simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 I2S simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S # for APL -simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 DSP_A -simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 DSP_B -simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 LEFT_J -simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000 I2S -simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S +APL_PROTOCOL_TESTS=(I2S LEFT_J DSP_A DSP_B) +APL_SSP_TESTS=(0 1 2 3 4 5) +APL_MODE_TESTS=(volume src) +APL_FORMAT_TESTS=(s16le s24le s32le) + +for protocol in ${APL_PROTOCOL_TESTS[@]} +do + for ssp in ${APL_SSP_TESTS[@]} + do + for mode in ${APL_MODE_TESTS[@]} + do + for format in ${APL_FORMAT_TESTS[@]} + do + simple_test nocodec $mode "NoCodec" $format $ssp s16le 16 16 1536000 24576000 $protocol + simple_test nocodec $mode "NoCodec" $format $ssp s24le 32 24 3072000 24576000 $protocol + simple_test nocodec $mode "NoCodec" $format $ssp s32le 32 32 3072000 24576000 $protocol + + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s16le 16 16 1536000 24576000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s24le 32 24 3072000 24576000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s32le 32 32 3072000 24576000 $protocol + done + done + simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 16 16 1536000 24576000 $protocol + simple_test nocodec passthrough "NoCodec" s24le $ssp s24le 32 24 3072000 24576000 $protocol + simple_test nocodec passthrough "NoCodec" s32le $ssp s32le 32 32 3072000 24576000 $protocol + + simple_test codec passthrough "SSP${ssp}-Codec" s16le $ssp s16le 16 16 1536000 24576000 $protocol + simple_test codec passthrough "SSP${ssp}-Codec" s24le $ssp s24le 32 24 3072000 24576000 $protocol + simple_test codec passthrough "SSP${ssp}-Codec" s32le $ssp s32le 32 32 3072000 24576000 $protocol + done +done + +for protocol in ${APL_PROTOCOL_TESTS[@]} +do + for ssp in ${APL_SSP_TESTS[@]} + do + for mode in ${APL_MODE_TESTS[@]} + do + for format in ${APL_FORMAT_TESTS[@]} + do + simple_test nocodec $mode "NoCodec" $format $ssp s16le 20 16 1920000 19200000 $protocol + simple_test nocodec $mode "NoCodec" $format $ssp s24le 25 24 2400000 19200000 $protocol + + simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol + simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol + done + done + simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 20 16 1920000 19200000 $protocol + simple_test nocodec passthrough "NoCodec" s24le $ssp s24le 25 24 2400000 19200000 $protocol + + simple_test codec passthrough "SSP${ssp}-Codec" s16le $ssp s16le 20 16 1920000 19200000 $protocol + simple_test codec passthrough "SSP${ssp}-Codec" s24le $ssp s24le 25 24 2400000 19200000 $protocol + done +done # for CNL simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: rename topologies to use sof prefix
by Liam Girdwood 13 Apr '18

13 Apr '18

Use sof- prefix instead of reef- Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/Makefile.am | 54 ++++++----- topology/reef-bxt-nocodec.m4 | 100 --------------------- .../{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} | 0 .../{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} | 0 topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} | 0 topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} | 0 topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} | 0 .../{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} | 0 topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} | 0 topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} | 0 topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} | 0 .../{reef-cht-max98090.m4 => sof-cht-max98090.m4} | 0 .../{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} | 0 topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} | 0 topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} | 0 15 files changed, 26 insertions(+), 128 deletions(-) delete mode 100644 topology/reef-bxt-nocodec.m4 rename topology/{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} (100%) rename topology/{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} (100%) rename topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} (100%) rename topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} (100%) rename topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} (100%) rename topology/{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} (100%) rename topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} (100%) rename topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} (100%) rename topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} (100%) rename topology/{reef-cht-max98090.m4 => sof-cht-max98090.m4} (100%) rename topology/{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} (100%) rename topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} (100%) rename topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} (100%) diff --git a/topology/Makefile.am b/topology/Makefile.am index 31d266e..73e10e9 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -16,20 +16,19 @@ DEPS = \ # MACHINES = \ - reef-cht-nocodec.tplg \ - reef-cht-max98090.tplg \ - reef-apl-nocodec.tplg \ - reef-bxt-nocodec.tplg \ - reef-byt-nocodec.tplg \ - reef-bdw-rt286.tplg \ - reef-bdw-rt5640.tplg \ - reef-byt-rt5640.tplg \ - reef-byt-rt5645.tplg \ - reef-byt-rt5651.tplg \ - reef-byt-da7213.tplg \ - reef-cnl-rt274.tplg \ - reef-hsw-rt5640.tplg \ - reef-apl-tdf8532.tplg + sof-cht-nocodec.tplg \ + sof-cht-max98090.tplg \ + sof-apl-nocodec.tplg \ + sof-byt-nocodec.tplg \ + sof-bdw-rt286.tplg \ + sof-bdw-rt5640.tplg \ + sof-byt-rt5640.tplg \ + sof-byt-rt5645.tplg \ + sof-byt-rt5651.tplg \ + sof-byt-da7213.tplg \ + sof-cnl-rt274.tplg \ + sof-hsw-rt5640.tplg \ + sof-apl-tdf8532.tplg # Uncomment the following line if you want to debug conf files .PRECIOUS: %.conf @@ -47,17 +46,16 @@ clean-local: rm -f *.tplg EXTRA_DIST = \ - reef-cht-nocodec.m4 \ - reef-cht-max98090.m4 \ - reef-apl-nocodec.m4 \ - reef-bxt-nocodec.m4 \ - reef-byt-nocodec.m4 \ - reef-bdw-rt286.m4 \ - reef-bdw-rt5640.m4 \ - reef-byt-rt5640.m4 \ - reef-byt-rt5645.m4 \ - reef-byt-rt5651.m4 \ - reef-byt-da7213.m4 \ - reef-cnl-rt274.m4 \ - reef-hsw-rt5640.m4 \ - reef-apl-tdf8532.m4 + sof-cht-nocodec.m4 \ + sof-cht-max98090.m4 \ + sof-apl-nocodec.m4 \ + sof-byt-nocodec.m4 \ + sof-bdw-rt286.m4 \ + sof-bdw-rt5640.m4 \ + sof-byt-rt5640.m4 \ + sof-byt-rt5645.m4 \ + sof-byt-rt5651.m4 \ + sof-byt-da7213.m4 \ + sof-cnl-rt274.m4 \ + sof-hsw-rt5640.m4 \ + sof-apl-tdf8532.m4 diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 deleted file mode 100644 index 7e2b624..0000000 --- a/topology/reef-bxt-nocodec.m4 +++ /dev/null @@ -1,100 +0,0 @@ -# -# Topology for generic Broxton board with no codec. -# - -# Include topology builder -include(`utils.m4') -include(`dai.m4') -include(`pipeline.m4') - -# Include TLV library -include(`common/tlv.m4') - -# Include Token library -include(`sof/tokens.m4') - -# Include Broxton DSP configuration -include(`dsps/bxt.m4') - -# -# Define the pipelines -# -# PCM0 ----> volume ---------------+ -# |--low latency mixer ----> volume ----> SSP2 -# PCM2 ----> SRC -----> volume ----+ -# | -# Tone -----> volume ----+ -# -# PCM1 <---- Volume <---- SSP2 -# - -# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, - 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) - -# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 2 for PCM audio capture data -PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, - 2, 0, 2, s32le, - 48, 1000, 0, 0, 0, 2) - -# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. -# Schedule 192 frames per 4000us deadline on core 0 with priority 1 -# Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, - 3, 1, 2, s32le, - 192, 4000, 1, 0, 0, 3) - -# Tone Playback pipeline 5 using max 2 channels of s32le. -# Schedule 192 frames per 4000us deadline on core 0 with priority 2 -PIPELINE_ADD(sof/pipe-tone.m4, - 5, 2, s32le, - 192, 4000, 2, 0) - -# Connect pipelines together -SectionGraph."pipe-bxt-nocodec" { - index "0" - - lines [ - # media 0 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - #tone - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) - ] -} - -# -# DAI configuration -# -# SSP port 2 is our only pipeline DAI -# - -# playback DAI is SSP2 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, 2, NoCodec, - PIPELINE_SOURCE_1, 2, s24le, - 48, 1000, 0, 0) - -# capture DAI is SSP2 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, 2, NoCodec, - PIPELINE_SINK_2, 2, s24le, - 48, 1000, 0, 0) - -# PCM Low Latency -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, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 similarity index 100% rename from topology/reef-apl-nocodec.m4 rename to topology/sof-apl-nocodec.m4 diff --git a/topology/reef-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 similarity index 100% rename from topology/reef-apl-tdf8532.m4 rename to topology/sof-apl-tdf8532.m4 diff --git a/topology/reef-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 similarity index 100% rename from topology/reef-bdw-rt286.m4 rename to topology/sof-bdw-rt286.m4 diff --git a/topology/reef-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 similarity index 100% rename from topology/reef-bdw-rt5640.m4 rename to topology/sof-bdw-rt5640.m4 diff --git a/topology/reef-byt-da7213.m4 b/topology/sof-byt-da7213.m4 similarity index 100% rename from topology/reef-byt-da7213.m4 rename to topology/sof-byt-da7213.m4 diff --git a/topology/reef-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 similarity index 100% rename from topology/reef-byt-nocodec.m4 rename to topology/sof-byt-nocodec.m4 diff --git a/topology/reef-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 similarity index 100% rename from topology/reef-byt-rt5640.m4 rename to topology/sof-byt-rt5640.m4 diff --git a/topology/reef-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 similarity index 100% rename from topology/reef-byt-rt5645.m4 rename to topology/sof-byt-rt5645.m4 diff --git a/topology/reef-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 similarity index 100% rename from topology/reef-byt-rt5651.m4 rename to topology/sof-byt-rt5651.m4 diff --git a/topology/reef-cht-max98090.m4 b/topology/sof-cht-max98090.m4 similarity index 100% rename from topology/reef-cht-max98090.m4 rename to topology/sof-cht-max98090.m4 diff --git a/topology/reef-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 similarity index 100% rename from topology/reef-cht-nocodec.m4 rename to topology/sof-cht-nocodec.m4 diff --git a/topology/reef-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 similarity index 100% rename from topology/reef-cnl-rt274.m4 rename to topology/sof-cnl-rt274.m4 diff --git a/topology/reef-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 similarity index 100% rename from topology/reef-hsw-rt5640.m4 rename to topology/sof-hsw-rt5640.m4 -- 2.14.1

2 2