OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #132 from cujomalainey/soft-cleanup 

SOFT cleanup
This commit is contained in:
Liam Girdwood 2018-11-17 09:45:57 +00:00 committed by GitHub
parent 8cc1daddfc d710f99de9
commit a01fd66665
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 59 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -20,3 +20,6 @@ rwav/rwav
*.tplg
topology/*.conf
topology/test/*.conf
eqctl/sof-eqctl
rmbox/sof-logger
rmbox/sof-rmbox

2
topology/sof-apl-da7219.m4
View File

@ -1,5 +1,5 @@
#
# Topology for AppoloLake with headset on SSP1, spk on SSP5 and DMIC capture
# Topology for ApolloLake with Dialog7219 codec.
#
# Include topology builder

2
topology/sof-apl-eq-dmic.m4
View File

@ -20,7 +20,7 @@ include(`platform/intel/dmic.m4')
#
# Define the pipelines
#
# PCM6 <---- volume <----- DMIC6 (DMIC01)
# PCM6 <---- EQ IIR <----- DMIC6 (DMIC01)
#
dnl PIPELINE_PCM_ADD(pipeline,

4
topology/sof-apl-eq-pcm512x.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Apollolake UP^2 with pcm512x codec.
# Topology for generic Apollolake UP^2 with pcm512x codec with equalizer components.
#
# Include topology builder
@ -20,7 +20,7 @@ include(`platform/intel/bxt.m4')
#
# Define the pipelines
#
# PCM0 ----> volume -----> SSP5 (pcm512x)
# PCM0 ----> EQ IIR ----> EQ FIR ----> volume ----> SSP5 (pcm512x)
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

20
topology/sof-apl-nocodec.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Apollolake board with no codec.
# Topology for generic Apollolake board with no codec and digital mic array.
#
# Include topology builder
@ -21,18 +21,12 @@ include(`platform/intel/dmic.m4')
#
# Define the pipelines
#
# PCM0 ----> volume -----> SSP0
# <---- volume <----- SSP0
# PCM1 ----> Volume <----- SSP1
# <---- Volume <----- SSP1
# PCM2 ----> volume -----> SSP2
# <---- Volume <----- SSP2
# PCM3 ----> volume -----> SSP3
# <---- volume <----- SSP3
# PCM4 ----> volume -----> SSP4
# <---- Volume <----- SSP4
# PCM5 ----> volume -----> SSP5
# <---- volume <----- SSP5
# PCM0 <---> volume <----> SSP0
# PCM1 <---> Volume <----> SSP1
# PCM2 <---> volume <----> SSP2
# PCM3 <---> volume <----> SSP3
# PCM4 <---> volume <----> SSP4
# PCM5 <---> volume <----> SSP5
# PCM6 <---- volume <----- DMIC6 (DMIC01)
#

5
topology/sof-apl-pcm512x.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Apollolake UP^2 with pcm512x codec.
# Topology for generic Apollolake UP^2 with pcm512x codec and HDMI.
#
# Include topology builder
@ -24,6 +24,9 @@ DEBUG_START
# Define the pipelines
#
# PCM0 ----> volume -----> SSP5 (pcm512x)
# PCM1 ----> volume -----> iDisp1
# PCM2 ----> volume -----> iDisp2
# PCM3 ----> volume -----> iDisp3
#
dnl PIPELINE_PCM_ADD(pipeline,

16
topology/sof-apl-tdf8532.m4
View File

@ -20,16 +20,12 @@ include(`platform/intel/bxt.m4')
#
# Define the pipelines
#
# PCM0 ----> volume -----> SSP4
# PCM1 ----> volume -----> SSP2(Dirana Pb)
# <---- Volume <----- SSP2(Dirana Cp)
# PCM2 ----> volume -----> SSP0(BT HFP out)
# <---- volume <----- SSP0(BT HFP in)
# PCM3 <---- Volume <----- SSP1(HDMI in)
# PCM4 ----> volume -----> SSP3(Modem out)
# <---- volume <----- SSP3(Modem in)
# PCM5 ----> volume -----> SSP5(TestPin out)
# <---- volume <----- SSP3(TestPin in)
# PCM0 -----> Volume -----> SSP4
# PCM1 <----> Volume <----> SSP2(Dirana Pb/Cp)
# PCM2 <----> Volume <----> SSP0(BT HFP out/in)
# PCM3 <----- Volume <----- SSP1(HDMI in)
# PCM4 <----> Volume <----> SSP3(Modem out/in)
# PCM5 <----> Volume <----> SSP5(TestPin out/in)
#
# Low Latency playback pipeline 1 on PCM 0 using max 4 channels of s32le.

8
topology/sof-bdw-rt286.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Broadwell board with no codec.
# Topology for generic Broadwell board with rt286.
#
# Include topology builder
@ -21,12 +21,12 @@ include(`platform/intel/bdw.m4')
# Define the pipelines
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# |--low latency mixer ----> volume ----> SSP0
# PCM1 -----> volume -----> SRC ---+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP0
# PCM0 <---- Volume <---- SSP0
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

8
topology/sof-bdw-rt5640.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Broadwell board with no codec.
# Topology for generic Broadwell board with rt5640.
#
# Include topology builder
@ -21,12 +21,12 @@ include(`platform/intel/bdw.m4')
# Define the pipelines
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# |--low latency mixer ----> volume ----> SSP0
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP0
# PCM0 <---- Volume <---- SSP0
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

4
topology/sof-byt-da7213.m4
View File

@ -22,11 +22,11 @@ include(`platform/intel/byt.m4')
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM0 <---- Volume <---- SSP2
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

6
topology/sof-byt-nocodec.m4
View File

@ -21,12 +21,12 @@ include(`platform/intel/byt.m4')
# Define the pipelines
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# |--low latency mixer ----> volume ----> SSP2 (NoCodec)
# PCM2 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM1 <---- Volume <---- SSP2 (NoCodec)
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

4
topology/sof-byt-rt5640.m4
View File

@ -22,11 +22,11 @@ include(`platform/intel/byt.m4')
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM0 <---- Volume <---- SSP2
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

6
topology/sof-byt-rt5645.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Baytrail board with no codec.
# Topology for generic Baytrail board with RT5645.
#
# Include topology builder
@ -22,11 +22,11 @@ include(`platform/intel/byt.m4')
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM0 <---- Volume <---- SSP2
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

4
topology/sof-byt-rt5651.m4
View File

@ -22,11 +22,11 @@ include(`platform/intel/byt.m4')
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM0 <---- Volume <---- SSP2
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

4
topology/sof-cht-max98090.m4
View File

@ -22,11 +22,11 @@ include(`platform/intel/cht.m4')
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM0 <---- Volume <---- SSP2
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

6
topology/sof-cht-nocodec.m4
View File

@ -21,12 +21,12 @@ include(`platform/intel/cht.m4')
# Define the pipelines
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# |--low latency mixer ----> volume ----> SSP2 (NoCodec)
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP2
# PCM0 <---- Volume <---- SSP2 (NoCodec)
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

3
topology/sof-cnl-rt274.m4
View File

@ -20,9 +20,8 @@ include(`platform/intel/cnl.m4')
#
# Define the pipelines
#
# PCM0 ----> volume -----> volume ----> SSP0
# PCM0 <---> volume <---> SSP0
#
# PCM1 <---- Volume <---- SSP0
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le.

4
topology/sof-glk-da7219.m4
View File

@ -1,5 +1,5 @@
#
# Topology for AppoloLake with headset on SSP2, spk on SSP1 and DMIC capture
# Topology for GeminiLake with Dialog7219.
#
# Include topology builder
@ -24,7 +24,7 @@ include(`platform/intel/dmic.m4')
#
# PCM0 ----> volume (pipe 1) -----> SSP1 (speaker - maxim98357a, BE link 0)
# PCM1 <---> volume (pipe 2,3) <----> SSP2 (headset - da7219, BE link 1)
# PCM99 <---- volume (pipe 4) <----- DMIC0 (dmic capture, BE link 2)
# PCM99 <---- DMIC0 (dmic capture, BE link 2)
# PCM5 ----> volume (pipe 5) -----> iDisp1 (HDMI/DP playback, BE link 3)
# PCM6 ----> Volume (pipe 6) -----> iDisp2 (HDMI/DP playback, BE link 4)
# PCM7 ----> volume (pipe 7) -----> iDisp3 (HDMI/DP playback, BE link 5)

8
topology/sof-hsw-rt5640.m4
View File

@ -1,5 +1,5 @@
#
# Topology for generic Haswell board with no codec.
# Topology for generic Haswell board with RT5640.
#
# Include topology builder
@ -21,12 +21,12 @@ include(`platform/intel/hsw.m4')
# Define the pipelines
#
# PCM0 ----> volume ---------------+
# |--low latency mixer ----> volume ----> SSP2
# PCM2 ----> SRC -----> volume ----+
# |--low latency mixer ----> volume ----> SSP0
# PCM1 -----> volume ----> SRC ----+
# |
# Tone -----> volume ----+
#
# PCM1 <---- Volume <---- SSP0
# PCM0 <---- Volume <---- SSP0
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.

4
topology/sof-icl-nocodec.m4
View File

@ -20,9 +20,7 @@ include(`platform/intel/icl.m4')
#
# Define the pipelines
#
# PCM0 ----> Volume ----> SSP0
#
# PCM1 <---- Volume <---- SSP0
# PCM0 <---> Volume <---> SSP0 (NoCodec)
#
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le.

4
topology/sof/pipe-eq-capture.m4
View File

@ -1,8 +1,8 @@
# Capture Passthrough Pipeline and PCM
# Capture EQ Pipeline and PCM
#
# Pipeline Endpoints for connection are :-
#
# host PCM_C <-- B0 <-- sink DAI0
# host PCM_C <--- B1 <--- EQ_IIR 0 <-- B0 <-- sink DAI0
# Include topology builder
include(`utils.m4')