From 5ca8e8d39c5c1edec02414f3ba6b02201522726d Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Thu, 24 Aug 2017 21:52:00 +0100 Subject: [PATCH] topology: Remove second SRC from BYT/CHT default topologies SRC in default full rate and high quality configuration is quite large. free up some memory on BYT and CHT by using only one SRC. TODO: Provide the SRC with configuration data for supported rates and quality in order to significantly reduce it's footprint. Signed-off-by: Liam Girdwood --- topology/reef-byt-nocodec.m4 | 9 --------- topology/reef-byt-rt5640.m4 | 9 --------- topology/reef-byt-rt5651.m4 | 18 +++++------------- topology/reef-cht-nocodec.m4 | 9 --------- 4 files changed, 5 insertions(+), 40 deletions(-) diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 96e2e4bb0..01b223da3 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -22,8 +22,6 @@ include(`dsps/byt.m4') # |--low latency mixer ----> volume ----> SSP2 # PCM2 ----> SRC -----> volume ----+ # | -# PCM3 ----> SRC -----> volume ----+ -# | # Tone -----> volume ----+ # # PCM1 <---- Volume <---- SSP2 @@ -44,11 +42,6 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0 # 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) -# 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) - # 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) @@ -60,8 +53,6 @@ SectionGraph."pipe-byt-nocodec" { lines [ # media 0 dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - # media 1 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4) #tone dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) ] diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index c135fed9b..00d31c751 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -22,8 +22,6 @@ include(`dsps/byt.m4') # |--low latency mixer ----> volume ----> SSP2 # PCM2 ----> SRC -----> volume ----+ # | -# PCM3 ----> SRC -----> volume ----+ -# | # Tone -----> volume ----+ # # PCM1 <---- Volume <---- SSP2 @@ -44,11 +42,6 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0 # 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) -# 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) - # 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) @@ -60,8 +53,6 @@ SectionGraph."pipe-byt-rt5640" { lines [ # media 0 dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - # media 1 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4) #tone dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) ] diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index 877492a3b..fd5263f8d 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -22,8 +22,6 @@ include(`dsps/byt.m4') # |--low latency mixer ----> volume ----> SSP2 # PCM2 ----> SRC -----> volume ----+ # | -# PCM3 ----> SRC -----> volume ----+ -# | # Tone -----> volume ----+ # # PCM1 <---- Volume <---- SSP2 @@ -44,11 +42,6 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0 # 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) -# 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) - # 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) @@ -60,8 +53,6 @@ SectionGraph."pipe-byt-rt5651" { lines [ # media 0 dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - # media 1 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4) #tone dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) ] @@ -73,11 +64,11 @@ SectionGraph."pipe-byt-rt5651" { # SSP port 2 is our only pipeline DAI # -# playback DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2) +# playback DAI is SSP2 using "Audio" DAPM stream name and 2 periods +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, Audio, PIPELINE_SOURCE_1, 2) -# capture DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) +# capture DAI is SSP2 using "Audio" DAPM stream name and 2 periods +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, Audio, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present @@ -87,3 +78,4 @@ DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, 24, DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), DAI_TDM(2, 25, 3, 3)) + diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 381ff127e..334443b99 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -22,8 +22,6 @@ include(`dsps/cht.m4') # |--low latency mixer ----> volume ----> SSP2 # PCM2 ----> SRC -----> volume ----+ # | -# PCM3 ----> SRC -----> volume ----+ -# | # Tone -----> volume ----+ # # PCM1 <---- Volume <---- SSP2 @@ -39,11 +37,6 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 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) -# 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) - # 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 @@ -60,8 +53,6 @@ SectionGraph."pipe-cht-nocodec" { lines [ # media 0 dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - # media 1 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4) #tone dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) ]