From c569a95905b1c896ea18fe86bde33fe77a3ce6e8 Mon Sep 17 00:00:00 2001 From: Rander Wang Date: Tue, 9 Oct 2018 10:36:34 +0800 Subject: [PATCH] WHL: add a bespoke hda topology for WHL Only passthrough is required on WHL Signed-off-by: Rander Wang --- topology/Makefile.am | 2 + topology/sof-whl-hda.m4 | 156 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 topology/sof-whl-hda.m4 diff --git a/topology/Makefile.am b/topology/Makefile.am index 317db22..22191c0 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -20,6 +20,7 @@ MACHINES = \ sof-cht-nocodec.tplg \ sof-cht-max98090.tplg \ sof-apl-hdmi.tplg \ + sof-whl-hda.tplg \ sof-hda-generic.tplg \ sof-apl-nocodec.tplg \ sof-byt-nocodec.tplg \ @@ -59,6 +60,7 @@ EXTRA_DIST = \ sof-cht-nocodec.m4 \ sof-cht-max98090.m4 \ sof-apl-hdmi.m4 \ + sof-whl-hda.m4 \ sof-hda-generic.m4 \ sof-apl-nocodec.m4 \ sof-byt-nocodec.m4 \ diff --git a/topology/sof-whl-hda.m4 b/topology/sof-whl-hda.m4 new file mode 100644 index 0000000..0eec9e4 --- /dev/null +++ b/topology/sof-whl-hda.m4 @@ -0,0 +1,156 @@ +# +# HDA passthrough topology for WHL +# + +# Include topology builder +include(`utils.m4') +include(`dai.m4') +include(`pipeline.m4') +include(`hda.m4') + +# Include TLV library +include(`common/tlv.m4') + +# Include Token library +include(`sof/tokens.m4') + +# Include bxt DSP configuration +include(`platform/intel/bxt.m4') + +# +# Define the pipelines +# +# PCM0 <---> passthrough (pipe 1,2) <----> HDA Analog (HDA Analog playback/capture) +# PCM1 <---> passthrough (pipe 3,4) <----> HDA Digital (HDA Digital playback/capture) +# PCM3 ----> passthrough (pipe 7) -----> iDisp1 (HDMI/DP playback, BE link 3) +# PCM4 ----> passthrough (pipe 8) -----> iDisp2 (HDMI/DP playback, BE link 4) +# PCM5 ----> passthrough (pipe 9) -----> iDisp3 (HDMI/DP playback, BE link 5) +# + +# 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 +PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, + 1, 0, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, + 2, 0, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 3 on PCM 1 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, + 3, 1, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4, + 4, 1, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 7 on PCM 3 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, + 7, 3, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 8 on PCM 4 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, + 8, 4, 2, s32le, + 48, 1000, 0, 0) + +# Low Latency playback pipeline 9 on PCM 5 using max 2 channels of s32le. +# Schedule 48 frames per 1000us deadline on core 0 with priority 0 +PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4, + 9, 5, 2, s32le, + 48, 1000, 0, 0) + +# +# DAIs configuration +# + +# playback DAI is HDA Analog using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 1, HDA, 0, Analog Playback and Capture, + PIPELINE_SOURCE_1, 2, s32le, + 48, 1000, 0, 0) + +# capture DAI is HDA Analog using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 2, HDA, 0, Analog Playback and Capture, + PIPELINE_SINK_2, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is HDA Digital using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 3, HDA, 1, Digital Playback and Capture, + PIPELINE_SOURCE_3, 2, s32le, + 48, 1000, 0, 0) + +# capture DAI is HDA Digital using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-capture.m4, + 4, HDA, 1, Digital Playback and Capture, + PIPELINE_SINK_4, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is iDisp1 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 7, HDA, 3, iDisp1, + PIPELINE_SOURCE_7, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is iDisp2 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 8, HDA, 4, iDisp2, + PIPELINE_SOURCE_8, 2, s32le, + 48, 1000, 0, 0) + +# playback DAI is iDisp3 using 2 periods +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 +DAI_ADD(sof/pipe-dai-playback.m4, + 9, HDA, 5, iDisp3, + PIPELINE_SOURCE_9, 2, s32le, + 48, 1000, 0, 0) + +PCM_DUPLEX_ADD(HDA Analog, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) +PCM_DUPLEX_ADD(HDA Digital, 1, PIPELINE_PCM_3, PIPELINE_PCM_4) +PCM_PLAYBACK_ADD(HDMI1, 3, PIPELINE_PCM_7) +PCM_PLAYBACK_ADD(HDMI2, 4, PIPELINE_PCM_8) +PCM_PLAYBACK_ADD(HDMI3, 5, PIPELINE_PCM_9) + +# +# BE configurations - overrides config in ACPI if present +# + +# HDA outputs +HDA_DAI_CONFIG(0, 4, Analog Playback and Capture) +HDA_DAI_CONFIG(1, 5, Digital Playback and Capture) +# 3 HDMI/DP outputs (ID: 3,4,5) +HDA_DAI_CONFIG(3, 1, iDisp1) +HDA_DAI_CONFIG(4, 2, iDisp2) +HDA_DAI_CONFIG(5, 3, iDisp3) + + +VIRTUAL_DAPM_ROUTE_IN(codec0_in, HDA, 0, IN, 1) +VIRTUAL_DAPM_ROUTE_IN(codec1_in, HDA, 1, IN, 2) +VIRTUAL_DAPM_ROUTE_OUT(codec0_out, HDA, 0, OUT, 3) +VIRTUAL_DAPM_ROUTE_OUT(codec1_out, HDA, 1, OUT, 4) + +# codec2 is not supported in dai links but it exists +# in dapm routes, so hack this one to HDA1 +VIRTUAL_DAPM_ROUTE_IN(codec2_in, HDA, 1, IN, 5) +VIRTUAL_DAPM_ROUTE_OUT(codec2_out, HDA, 1, OUT, 6) + +VIRTUAL_DAPM_ROUTE_OUT(iDisp1_out, HDA, 3, OUT, 7) +VIRTUAL_DAPM_ROUTE_OUT(iDisp2_out, HDA, 4, OUT, 8) +VIRTUAL_DAPM_ROUTE_OUT(iDisp3_out, HDA, 5, OUT, 9)