From a6700afea1b5718974f96ad20094359a10bb7c00 Mon Sep 17 00:00:00 2001 From: Iuliana Prodan Date: Mon, 5 Feb 2024 17:20:17 +0200 Subject: [PATCH] topology1: imx8ulp: overwrite CHANNELS_MIN On 8ULP SAI is connected to BT which supports only 1 channel for both playback and record. Fixes: aaff3523144e ('topology1: pipe-volume-capture.m4: Set minimum number of channels to 2') Signed-off-by: Iuliana Prodan --- tools/topology/topology1/sof-imx8ulp-9x9-btsco.m4 | 5 ++--- tools/topology/topology1/sof-imx8ulp-btsco.m4 | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/topology/topology1/sof-imx8ulp-9x9-btsco.m4 b/tools/topology/topology1/sof-imx8ulp-9x9-btsco.m4 index ad561205f..c641942c5 100644 --- a/tools/topology/topology1/sof-imx8ulp-9x9-btsco.m4 +++ b/tools/topology/topology1/sof-imx8ulp-9x9-btsco.m4 @@ -25,7 +25,8 @@ include(`platform/imx/imx8.m4') # PCM0 <----> volume <-----> SAI6 (connect to BT) # -define(`CHANNELS_MIN', 1) +# SAI6 is connected to BT which supports only 1 channel for playback and record +ifdef(`CHANNELS_MIN', `', `define(CHANNELS_MIN, 1)') dnl PIPELINE_PCM_ADD(pipeline, dnl pipe id, pcm, max channels, format, @@ -40,8 +41,6 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1000, 0, 0, `RATE', `RATE', `RATE') -undefine(`CHANNELS_MIN') - # Low Latency capture pipeline 2 on PCM 0 using max 1 channels of s16le. # Set 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, diff --git a/tools/topology/topology1/sof-imx8ulp-btsco.m4 b/tools/topology/topology1/sof-imx8ulp-btsco.m4 index 4e1492f22..b9570a002 100644 --- a/tools/topology/topology1/sof-imx8ulp-btsco.m4 +++ b/tools/topology/topology1/sof-imx8ulp-btsco.m4 @@ -25,7 +25,8 @@ include(`platform/imx/imx8.m4') # PCM0 <----> volume <-----> SAI5 (connect to BT) # -define(`CHANNELS_MIN', 1) +# SAI5 is connected to BT which supports only 1 channel for playback and record +ifdef(`CHANNELS_MIN', `', `define(CHANNELS_MIN, 1)') dnl PIPELINE_PCM_ADD(pipeline, dnl pipe id, pcm, max channels, format, @@ -40,14 +41,13 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, 1000, 0, 0, `RATE', `RATE', `RATE') -undefine(`CHANNELS_MIN') - # Low Latency capture pipeline 2 on PCM 0 using max 1 channels of s16le. # Set 1000us deadline with priority 0 on core 0 PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4, 2, 0, 1, s16le, 1000, 0, 0, `RATE', `RATE', `RATE') + # # DAIs configuration #