[Sound-open-firmware] [PATCH 3/3] topology: indent reef-*.m4 files, fix typos
Pierre-Louis Bossart
pierre-louis.bossart at linux.intel.com
Wed Sep 13 02:07:50 CEST 2017
Align parameters on different lines to allow for easier visual
comparison and direct mapping with comments in build.m4
Also fix typo in comments s/priorty/priority/g
No functional change
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
---
topology/reef-apl-nocodec.m4 | 34 +++++++++++++++++++++++++---------
topology/reef-bdw-rt286.m4 | 34 +++++++++++++++++++++++++---------
topology/reef-bdw-rt5640.m4 | 34 +++++++++++++++++++++++++---------
topology/reef-bxt-nocodec.m4 | 34 +++++++++++++++++++++++++---------
topology/reef-byt-nocodec.m4 | 30 ++++++++++++++++++++++--------
topology/reef-byt-rt5640.m4 | 30 ++++++++++++++++++++++--------
topology/reef-byt-rt5651.m4 | 30 ++++++++++++++++++++++--------
topology/reef-cht-nocodec.m4 | 30 ++++++++++++++++++++++--------
topology/reef-hsw-rt5640.m4 | 34 +++++++++++++++++++++++++---------
9 files changed, 213 insertions(+), 77 deletions(-)
diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4
index 068c06b..f87a4e9 100644
--- a/topology/reef-apl-nocodec.m4
+++ b/topology/reef-apl-nocodec.m4
@@ -32,26 +32,36 @@ include(`dsps/bxt.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le.
# Schedule 96 frames per 2000us 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, 2, 2, s32le, 96, 2000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 96, 2000, 1, 0, 0, 3)
# PCM Media Playback pipeline 4 on PCM 3 using max 2 channels of s32le.
# Schedule 96 frames per 2000us deadline on core 0 with priority 1
# Use DMAC 0 channel 4 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 4, 3, 2, s32le, 96, 2000, 1, 0, 0, 4)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 4, 3, 2, s32le,
+ 96, 2000, 1, 0, 0, 4)
# 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-apl-nocodec" {
@@ -74,12 +84,18 @@ 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, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# 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, 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, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 1a6042a..eae2065 100644
--- a/topology/reef-bdw-rt286.m4
+++ b/topology/reef-bdw-rt286.m4
@@ -32,26 +32,36 @@ include(`dsps/bdw.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le.
# Schedule 96 frames per 2000us 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, 2, 2, s32le, 96, 2000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 96, 2000, 1, 0, 0, 3)
# PCM Media Playback pipeline 4 on PCM 3 using max 2 channels of s32le.
# Schedule 96 frames per 2000us deadline on core 0 with priority 1
# Use DMAC 0 channel 4 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 4, 3, 2, s32le, 96, 2000, 1, 0, 0, 4)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 4, 3, 2, s32le,
+ 96, 2000, 1, 0, 0, 4)
# 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-bdw-rt286" {
@@ -74,12 +84,18 @@ 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, 1, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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, 1, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 2453103..60feb82 100644
--- a/topology/reef-bdw-rt5640.m4
+++ b/topology/reef-bdw-rt5640.m4
@@ -32,26 +32,36 @@ include(`dsps/bdw.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le.
# Schedule 96 frames per 2000us 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, 2, 2, s32le, 96, 2000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 96, 2000, 1, 0, 0, 3)
# PCM Media Playback pipeline 4 on PCM 3 using max 2 channels of s32le.
# Schedule 96 frames per 2000us deadline on core 0 with priority 1
# Use DMAC 0 channel 4 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 4, 3, 2, s32le, 96, 2000, 1, 0, 0, 4)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 4, 3, 2, s32le,
+ 96, 2000, 1, 0, 0, 4)
# 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-bdw-rt5640" {
@@ -74,12 +84,18 @@ 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, 1, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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, 1, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 e86b30f..744e9b1 100644
--- a/topology/reef-bxt-nocodec.m4
+++ b/topology/reef-bxt-nocodec.m4
@@ -32,26 +32,36 @@ include(`dsps/bxt.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 192, 4000, 1, 0, 0, 3)
# PCM Media Playback pipeline 4 on PCM 3 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 4)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 192, 4000, 1, 0, 0, 4)
# 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-bxt-nocodec" {
@@ -74,12 +84,18 @@ 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, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# 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, 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, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 27e7468..05373f9 100644
--- a/topology/reef-byt-nocodec.m4
+++ b/topology/reef-byt-nocodec.m4
@@ -30,21 +30,29 @@ include(`dsps/byt.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-byt-nocodec" {
@@ -65,12 +73,18 @@ 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, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# 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, 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, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 8d70e52..911b4d1 100644
--- a/topology/reef-byt-rt5640.m4
+++ b/topology/reef-byt-rt5640.m4
@@ -30,21 +30,29 @@ include(`dsps/byt.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-byt-rt5640" {
@@ -65,12 +73,18 @@ 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, 1, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# 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, 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, 1, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 b759137..c6f20a4 100644
--- a/topology/reef-byt-rt5651.m4
+++ b/topology/reef-byt-rt5651.m4
@@ -30,21 +30,29 @@ include(`dsps/byt.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-byt-rt5651" {
@@ -65,12 +73,18 @@ 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, 1, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# 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, 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, 1, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 5f2be4c..43e0e6e 100644
--- a/topology/reef-cht-nocodec.m4
+++ b/topology/reef-cht-nocodec.m4
@@ -30,21 +30,29 @@ include(`dsps/cht.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-cht-nocodec" {
@@ -65,12 +73,18 @@ 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, 1, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# 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, 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, 1, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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 f64d36b..3d26149 100644
--- a/topology/reef-hsw-rt5640.m4
+++ b/topology/reef-hsw-rt5640.m4
@@ -32,26 +32,36 @@ include(`dsps/hsw.m4')
# 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)
+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 1 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, 1, 2, s32le, 48, 1000, 0, 0, 0, 2)
+PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
+ 2, 1, 2, s32le,
+ 48, 1000, 0, 0, 0, 2)
# PCM Media Playback pipeline 3 on PCM 2 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 3)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 192, 4000, 1, 0, 0, 3)
# PCM Media Playback pipeline 4 on PCM 3 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, 2, 2, s32le, 192, 4000, 1, 0, 0, 4)
+PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
+ 3, 2, 2, s32le,
+ 192, 4000, 1, 0, 0, 4)
# 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)
+PIPELINE_ADD(sof/pipe-tone.m4,
+ 5, 2, s32le,
+ 192, 4000, 2, 0)
# Connect pipelines together
SectionGraph."pipe-hsw-rt5640" {
@@ -74,12 +84,18 @@ 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, 1, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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, 1, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0)
+# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 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