[Sound-open-firmware] [PATCH] topology: Add support for DAI pipeline ID config
Liam Girdwood
liam.r.girdwood at linux.intel.com
Mon Sep 11 17:13:58 CEST 2017
Allow topology to configure the pipeline ID of any DAI specific
pipeline instead of using 0.
Signed-off-by: Liam Girdwood <liam.r.girdwood at linux.intel.com>
---
topology/m4/build.m4 | 26 +++++++++++++-------------
topology/reef-apl-nocodec.m4 | 4 ++--
topology/reef-bdw-rt286.m4 | 4 ++--
topology/reef-bdw-rt5640.m4 | 4 ++--
topology/reef-bxt-nocodec.m4 | 4 ++--
topology/reef-byt-nocodec.m4 | 4 ++--
topology/reef-byt-rt5640.m4 | 4 ++--
topology/reef-byt-rt5651.m4 | 4 ++--
topology/reef-cht-nocodec.m4 | 4 ++--
topology/reef-hsw-rt5640.m4 | 4 ++--
10 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/topology/m4/build.m4 b/topology/m4/build.m4
index 7d248da..273e6b4 100644
--- a/topology/m4/build.m4
+++ b/topology/m4/build.m4
@@ -81,7 +81,7 @@ define(`PIPELINE_ADD',
`include($1)'
)
-dnl DAI_ADD(pipeline, dai type, dai_index, stream_name, buffer, periods, format, frames, deadline, priority, core)
+dnl DAI_ADD(pipeline, pipeline id, dai type, dai_index, stream_name, buffer, periods, format, frames, deadline, priority, core)
define(`DAI_ADD',
`undefine(`PIPELINE_ID')'
`undefine(`DAI_TYPE')'
@@ -94,18 +94,18 @@ define(`DAI_ADD',
`undefine(`SCHEDULE_DEADLINE')'
`undefine(`SCHEDULE_PRIORITY')'
`undefine(`SCHEDULE_CORE')'
-`define(`PIPELINE_ID', 0)'
-`define(`DAI_TYPE', STR($2))'
-`define(`DAI_INDEX', STR($3))'
-`define(`DAI_SNAME', $4)'
-`define(`DAI_BUF', $5)'
-`define(`DAI_NAME', $2$3)'
-`define(`DAI_PERIODS', $6)'
-`define(`DAI_FORMAT', $7)'
-`define(`SCHEDULE_FRAMES', $8)'
-`define(`SCHEDULE_DEADLINE', $9)'
-`define(`SCHEDULE_PRIORITY', $10)'
-`define(`SCHEDULE_CORE', $11)'
+`define(`PIPELINE_ID', $2)'
+`define(`DAI_TYPE', STR($3))'
+`define(`DAI_INDEX', STR($4))'
+`define(`DAI_SNAME', $5)'
+`define(`DAI_BUF', $6)'
+`define(`DAI_NAME', $3$4)'
+`define(`DAI_PERIODS', $7)'
+`define(`DAI_FORMAT', $8)'
+`define(`SCHEDULE_FRAMES', $9)'
+`define(`SCHEDULE_DEADLINE', $10)'
+`define(`SCHEDULE_PRIORITY', $11)'
+`define(`SCHEDULE_CORE', $12)'
`include($1)'
)
diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4
index ef80fd3..068c06b 100644
--- a/topology/reef-apl-nocodec.m4
+++ b/topology/reef-apl-nocodec.m4
@@ -75,11 +75,11 @@ SectionGraph."pipe-apl-nocodec" {
# playback DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4
index e3f8dd9..1a6042a 100644
--- a/topology/reef-bdw-rt286.m4
+++ b/topology/reef-bdw-rt286.m4
@@ -75,11 +75,11 @@ SectionGraph."pipe-bdw-rt286" {
# playback DAI is SSP0 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP0 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4
index 4344605..2453103 100644
--- a/topology/reef-bdw-rt5640.m4
+++ b/topology/reef-bdw-rt5640.m4
@@ -75,11 +75,11 @@ SectionGraph."pipe-bdw-rt5640" {
# playback DAI is SSP0 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP0 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4
index 486d4ea..e86b30f 100644
--- a/topology/reef-bxt-nocodec.m4
+++ b/topology/reef-bxt-nocodec.m4
@@ -75,11 +75,11 @@ SectionGraph."pipe-bxt-nocodec" {
# playback DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4
index 938666d..27e7468 100644
--- a/topology/reef-byt-nocodec.m4
+++ b/topology/reef-byt-nocodec.m4
@@ -66,11 +66,11 @@ SectionGraph."pipe-byt-nocodec" {
# playback DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4
index 05743e2..8d70e52 100644
--- a/topology/reef-byt-rt5640.m4
+++ b/topology/reef-byt-rt5640.m4
@@ -66,11 +66,11 @@ SectionGraph."pipe-byt-rt5640" {
# playback DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4
index cb9dcc2..b759137 100644
--- a/topology/reef-byt-rt5651.m4
+++ b/topology/reef-byt-rt5651.m4
@@ -66,11 +66,11 @@ SectionGraph."pipe-byt-rt5651" {
# playback DAI is SSP2 using "Audio" DAPM stream name and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP2 using "Audio" DAPM stream name and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4
index 52e8d50..5f2be4c 100644
--- a/topology/reef-cht-nocodec.m4
+++ b/topology/reef-cht-nocodec.m4
@@ -66,11 +66,11 @@ SectionGraph."pipe-cht-nocodec" {
# playback DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP2 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4
index af18633..f64d36b 100644
--- a/topology/reef-hsw-rt5640.m4
+++ b/topology/reef-hsw-rt5640.m4
@@ -75,11 +75,11 @@ SectionGraph."pipe-hsw-rt5640" {
# playback DAI is SSP0 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
# capture DAI is SSP0 using I2S DAPM stream and 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0
-DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+DAI_ADD(sof/pipe-dai-capture.m4, 1, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
#
# BE configurations - overrides config in ACPI if present
--
2.11.0
More information about the Sound-open-firmware
mailing list