diff --git a/.gitignore b/.gitignore index 023e264..9771824 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ rwav/rwav *.tplg topology/*.conf topology/test/*.conf +eqctl/sof-eqctl +rmbox/sof-logger +rmbox/sof-rmbox diff --git a/topology/sof-apl-da7219.m4 b/topology/sof-apl-da7219.m4 index 0c102fe..aaba865 100644 --- a/topology/sof-apl-da7219.m4 +++ b/topology/sof-apl-da7219.m4 @@ -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 diff --git a/topology/sof-apl-eq-dmic.m4 b/topology/sof-apl-eq-dmic.m4 index 7768af4..f38bb1a 100644 --- a/topology/sof-apl-eq-dmic.m4 +++ b/topology/sof-apl-eq-dmic.m4 @@ -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, diff --git a/topology/sof-apl-eq-pcm512x.m4 b/topology/sof-apl-eq-pcm512x.m4 index f1fda8d..25de024 100644 --- a/topology/sof-apl-eq-pcm512x.m4 +++ b/topology/sof-apl-eq-pcm512x.m4 @@ -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. diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 index 2a99560..b82503d 100644 --- a/topology/sof-apl-nocodec.m4 +++ b/topology/sof-apl-nocodec.m4 @@ -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) # diff --git a/topology/sof-apl-pcm512x.m4 b/topology/sof-apl-pcm512x.m4 index 3b4d01e..0688c98 100644 --- a/topology/sof-apl-pcm512x.m4 +++ b/topology/sof-apl-pcm512x.m4 @@ -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, diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index c82c1f0..b8d1faa 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -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. diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 index a750344..848ca42 100644 --- a/topology/sof-bdw-rt286.m4 +++ b/topology/sof-bdw-rt286.m4 @@ -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. diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 index 454e050..5280327 100644 --- a/topology/sof-bdw-rt5640.m4 +++ b/topology/sof-bdw-rt5640.m4 @@ -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. diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4 index 6008ff0..68fe756 100644 --- a/topology/sof-byt-da7213.m4 +++ b/topology/sof-byt-da7213.m4 @@ -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. diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 index 6df25ca..ee4e93e 100644 --- a/topology/sof-byt-nocodec.m4 +++ b/topology/sof-byt-nocodec.m4 @@ -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. diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 index 2177fe3..5e6cb04 100644 --- a/topology/sof-byt-rt5640.m4 +++ b/topology/sof-byt-rt5640.m4 @@ -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. diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 index 23f1a75..354104f 100644 --- a/topology/sof-byt-rt5645.m4 +++ b/topology/sof-byt-rt5645.m4 @@ -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. diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 index 724c34e..ee9b70e 100644 --- a/topology/sof-byt-rt5651.m4 +++ b/topology/sof-byt-rt5651.m4 @@ -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. diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4 index 627181f..b88af17 100644 --- a/topology/sof-cht-max98090.m4 +++ b/topology/sof-cht-max98090.m4 @@ -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. diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 index dae6dca..c56773a 100644 --- a/topology/sof-cht-nocodec.m4 +++ b/topology/sof-cht-nocodec.m4 @@ -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. diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 index d40efc1..3a0bce0 100644 --- a/topology/sof-cnl-rt274.m4 +++ b/topology/sof-cnl-rt274.m4 @@ -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. diff --git a/topology/sof-glk-da7219.m4 b/topology/sof-glk-da7219.m4 index 2132c13..0adcbcf 100644 --- a/topology/sof-glk-da7219.m4 +++ b/topology/sof-glk-da7219.m4 @@ -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) diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 index 272cb15..5a5fbc1 100644 --- a/topology/sof-hsw-rt5640.m4 +++ b/topology/sof-hsw-rt5640.m4 @@ -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. diff --git a/topology/sof-icl-nocodec.m4 b/topology/sof-icl-nocodec.m4 index 1dffe18..5801b6f 100644 --- a/topology/sof-icl-nocodec.m4 +++ b/topology/sof-icl-nocodec.m4 @@ -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. diff --git a/topology/sof/pipe-eq-capture.m4 b/topology/sof/pipe-eq-capture.m4 index 5b415f0..752bc66 100644 --- a/topology/sof/pipe-eq-capture.m4 +++ b/topology/sof/pipe-eq-capture.m4 @@ -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')