From 7e2f4e3b9c373fc621cd4bf00787ccb270925832 Mon Sep 17 00:00:00 2001 From: Mengdong Lin Date: Tue, 20 Nov 2018 19:28:48 -0500 Subject: [PATCH] topology: Remove sof-apl-hdmi.m4 sof-apl-hdmi.m4 is no longer needed. It was used in early stage of HDA enablement as the 1st reference. Now HDA settings are added to UP2/GLK/WHL platform m4 files. Signed-off-by: Mengdong Lin --- topology/Makefile.am | 1 - topology/sof-apl-hdmi.m4 | 93 ---------------------------------------- 2 files changed, 94 deletions(-) delete mode 100644 topology/sof-apl-hdmi.m4 diff --git a/topology/Makefile.am b/topology/Makefile.am index d6809f199..44b8a5964 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -19,7 +19,6 @@ DEPS = \ 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 \ diff --git a/topology/sof-apl-hdmi.m4 b/topology/sof-apl-hdmi.m4 deleted file mode 100644 index 00d7c6868..000000000 --- a/topology/sof-apl-hdmi.m4 +++ /dev/null @@ -1,93 +0,0 @@ -# -# Topology for generic Apollolake board with no codec. -# - -# Include topology builder -include(`utils.m4') -include(`dai.m4') -include(`hda.m4') -include(`ssp.m4') -include(`pipeline.m4') - -# Include TLV library -include(`common/tlv.m4') - -# Include Token library -include(`sof/tokens.m4') - -# Include Apollolake DSP configuration -include(`platform/intel/bxt.m4') - -# -# Define the pipelines -# -# PCM0 ----> volume -----> iDisp1 -# PCM1 ----> Volume -----> iDisp2 -# PCM2 ----> volume -----> iDisp3 - -dnl PIPELINE_PCM_ADD(pipeline, -dnl pipe id, pcm, max channels, format, -dnl frames, deadline, priority, core) - -# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s16le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, - 1, 0, 2, s16le, - 48, 1000, 0, 0) - -# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s16le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, - 2, 1, 2, s16le, - 48, 1000, 0, 0) - -# Low Latency playback pipeline 3 on PCM 2 using max 2 channels of s16le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4, - 3, 2, 2, s16le, - 48, 1000, 0, 0) - -# -# DAIs configuration -# - -dnl DAI_ADD(pipeline, -dnl pipe id, dai type, dai_index, dai_be, -dnl buffer, periods, format, -dnl frames, deadline, priority, core) - -# playback DAI is iDisp1 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 1, HDA, 0, iDisp1, - PIPELINE_SOURCE_1, 2, s16le, - 48, 1000, 0, 0) - -# playback DAI is iDisp2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 2, HDA, 1, iDisp2, - PIPELINE_SOURCE_2, 2, s16le, - 48, 1000, 0, 0) - -# playback DAI is iDisp3 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 3, HDA, 2, iDisp3, - PIPELINE_SOURCE_3, 2, s16le, - 48, 1000, 0, 0) - - -dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) -PCM_PLAYBACK_ADD(HDMI1, 0, PIPELINE_PCM_1) -PCM_PLAYBACK_ADD(HDMI2, 1, PIPELINE_PCM_2) -PCM_PLAYBACK_ADD(HDMI3, 2, PIPELINE_PCM_3) - -# -# BE configurations - overrides config in ACPI if present -# - -dnl HDA_DAI_CONFIG(dai_index, link_id, name) -HDA_DAI_CONFIG(0, 1, iDisp1) -HDA_DAI_CONFIG(1, 2, iDisp2) -HDA_DAI_CONFIG(2, 3, iDisp3)