Skip to content

topology: apl-pcm512x: align HDMI/DP PCM #1750

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

Closed
kv2019i wants to merge 1 commit into from
Closed

topology: apl-pcm512x: align HDMI/DP PCM #1750

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
25 changes: 13 additions & 12 deletions tools/topology/sof-apl-pcm512x.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ DEBUG_START

#
# Define the pipelines
# note: iDisp PCM mappings follow legacy HDA numbering
#
# PCM0 ----> volume -----> SSP5 (pcm512x)
# PCM1 ----> volume -----> iDisp1
# PCM2 ----> volume -----> iDisp2
# PCM3 ----> volume -----> iDisp3
# PCM3 ----> volume -----> iDisp1
# PCM7 ----> volume -----> iDisp2
# PCM8 ----> volume -----> iDisp3
#

dnl PIPELINE_PCM_ADD(pipeline,
Expand All @@ -41,24 +42,24 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le.
# Low Latency playback pipeline 2 on PCM 3 using max 2 channels of s32le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
2, 1, 2, s32le,
2, 3, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s32le.
# Low Latency playback pipeline 3 on PCM 7 using max 2 channels of s32le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
3, 2, 2, s32le,
3, 7, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency playback pipeline 4 on PCM 3 using max 2 channels of s32le.
# Low Latency playback pipeline 4 on PCM 8 using max 2 channels of s32le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
4, 3, 2, s32le,
4, 8, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)

Expand Down Expand Up @@ -119,9 +120,9 @@ DAI_ADD(sof/pipe-dai-playback.m4,
# PCM Low Latency, id 0
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)
PCM_PLAYBACK_ADD(HDMI1, 1, PIPELINE_PCM_2)
PCM_PLAYBACK_ADD(HDMI2, 2, PIPELINE_PCM_3)
PCM_PLAYBACK_ADD(HDMI3, 3, PIPELINE_PCM_4)
PCM_PLAYBACK_ADD(HDMI1, 3, PIPELINE_PCM_2)
PCM_PLAYBACK_ADD(HDMI2, 7, PIPELINE_PCM_3)
PCM_PLAYBACK_ADD(HDMI3, 8, PIPELINE_PCM_4)

#
# BE configurations - overrides config in ACPI if present
Expand Down