Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

topology1: imx8ulp: overwrite CHANNELS_MIN #8836

Merged
merged 1 commit into from
Feb 12, 2024
Merged

topology1: imx8ulp: overwrite CHANNELS_MIN #8836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions tools/topology/topology1/sof-imx8ulp-9x9-btsco.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions tools/topology/topology1/sof-imx8ulp-btsco.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
#
Expand Down
Loading