[Sound-open-firmware] [PATCH] topology: specify SSP port for NoCodec
Keyon Jie
yang.jie at linux.intel.com
Thu Mar 29 16:39:10 CEST 2018
Add prefix 'SSPx-' for stream name 'NoCodec' to match with SOF nocodec
driver.
Signed-off-by: Keyon Jie <yang.jie at linux.intel.com>
---
This shoule be merged together with driver patch:
[PATCH] ASoC: SOF: nocodec: add more BE dailinks.
Tested on GPMRB with:
Kernel https://github.com/plbossart/sound/ #topic/sof-v4.14
c2fdacbcda40ecd23944d960d1b1c34529fd284d
SOF: git://git.alsa-project.org/sound-open-firmware.git #1.1-stable
eba34c566d660c227d5691dcfc010594bd5ddf3d
SOFT: git://git.alsa-project.org/sound-open-firmware-tools.git #1.1-stable
739acd1e5e542b09f7b204f44350d676dacf0000
topology/reef-bxt-nocodec.m4 | 6 +++---
topology/reef-byt-nocodec.m4 | 6 +++---
topology/reef-cht-nocodec.m4 | 6 +++---
topology/test/tplg-build.sh | 44 ++++++++++++++++++++++----------------------
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4
index 7e2b624..3ae2401 100644
--- a/topology/reef-bxt-nocodec.m4
+++ b/topology/reef-bxt-nocodec.m4
@@ -76,14 +76,14 @@ SectionGraph."pipe-bxt-nocodec" {
# 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,
+ 1, SSP, 2, SSP2-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,
+ 2, SSP, 2, SSP2-NoCodec,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
@@ -93,7 +93,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, 24,
+DAI_CONFIG(SSP, 2, SSP2-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 3be5d00..9748f21 100644
--- a/topology/reef-byt-nocodec.m4
+++ b/topology/reef-byt-nocodec.m4
@@ -76,14 +76,14 @@ SectionGraph."pipe-byt-nocodec" {
# 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,
+ 1, SSP, 2, SSP2-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,
+ 2, SSP, 2, SSP2-NoCodec,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
@@ -93,7 +93,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, 24,
+DAI_CONFIG(SSP, 2, SSP2-NoCodec, 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 3f61e44..260af57 100644
--- a/topology/reef-cht-nocodec.m4
+++ b/topology/reef-cht-nocodec.m4
@@ -76,14 +76,14 @@ SectionGraph."pipe-cht-nocodec" {
# 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,
+ 1, SSP, 2, SSP2-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,
+ 2, SSP, 2, SSP2-NoCodec,
PIPELINE_SINK_2, 2, s24le,
48, 1000, 0, 0)
@@ -93,7 +93,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, 24,
+DAI_CONFIG(SSP, 2, SSP2-NoCodec, I2S, 24,
DAI_CLOCK(mclk, 19200000, slave),
DAI_CLOCK(bclk, 2400000, slave),
DAI_CLOCK(fsync, 48000, slave),
diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh
index 5a6a8f5..d8d5ad0 100755
--- a/topology/test/tplg-build.sh
+++ b/topology/test/tplg-build.sh
@@ -82,12 +82,12 @@ function tone_test {
}
# Pre-process the simple tests
-simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000
-simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000
-simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 19200000
-simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 19200000
-simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000
-simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000
+simple_test nocodec passthrough "SSP2-NoCodec" s16le 2 s16le 20 16 1920000 19200000
+simple_test nocodec passthrough "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 19200000
+simple_test nocodec volume "SSP2-NoCodec" s16le 2 s16le 20 16 1920000 19200000
+simple_test nocodec volume "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 19200000
+simple_test nocodec volume "SSP2-NoCodec" s16le 2 s24le 25 24 2400000 19200000
+simple_test nocodec src "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 19200000
simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000
simple_test codec passthrough "SSP2-Codec" s24le 2 s16le 20 16 1920000 19200000
@@ -100,25 +100,25 @@ simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000
simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000
# for APL
-simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000
-simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000
-simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000
-simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000
-simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000
-simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000
-simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000
-simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000
-simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s16le 4 s16le 16 16 1536000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s24le 4 s16le 16 16 1536000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s32le 4 s16le 16 16 1536000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s16le 4 s24le 32 24 3072000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s24le 4 s24le 32 24 3072000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s32le 4 s24le 32 24 3072000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s16le 4 s32le 32 32 3072000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s24le 4 s32le 32 32 3072000 24576000
+simple_test nocodec volume "SSP4-NoCodec" s32le 4 s32le 32 32 3072000 24576000
simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000
-simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000
-simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000
+simple_test nocodec volume "SSP5-NoCodec" s16le 5 s16le 16 16 1536000 24576000
+simple_test nocodec src "SSP4-NoCodec" s24le 4 s24le 32 24 3072000 24576000
# for CNL
-simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000
-simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 24000000
-simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 24000000
-simple_test nocodec volume "NoCodec" s24le 2 s16le 25 16 2400000 24000000
-simple_test nocodec src "NoCodec" s24le 4 s24le 25 24 2400000 24000000
+simple_test nocodec volume "SSP2-NoCodec" s16le 2 s16le 25 16 2400000 24000000
+simple_test nocodec volume "SSP2-NoCodec" s16le 2 s24le 25 24 2400000 24000000
+simple_test nocodec volume "SSP2-NoCodec" s24le 2 s24le 25 24 2400000 24000000
+simple_test nocodec volume "SSP2-NoCodec" s24le 2 s16le 25 16 2400000 24000000
+simple_test nocodec src "SSP2-NoCodec" s24le 4 s24le 25 24 2400000 24000000
# Tone test: Tone component only supports s32le currently
tone_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000
--
2.14.1
More information about the Sound-open-firmware
mailing list