From 2e319edcb663bc698d3eeece5c4c38633d38e03a Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 17:54:37 -0800 Subject: [PATCH 01/21] Ignore built binaries Git is seeing build artifacts Signed-off-by: Curtis Malainey --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) 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 From cbf60f2bb2549d5ee81a27fc3162615ec540456f Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:05:19 -0800 Subject: [PATCH 02/21] Correct sof-bdw-rt5640 Correct comments to reflect code Signed-off-by: Curtis Malainey --- topology/sof-bdw-rt5640.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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. From f704d361e1f975883dc759b010caa224acbd1617 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:09:34 -0800 Subject: [PATCH 03/21] Fix pipe-eq-capture comments Fix copy paste comment errors Signed-off-by: Curtis Malainey --- topology/sof/pipe-eq-capture.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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') From b65fe8e02163a98c5462f44d7a7cbbd0ed8f0843 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:10:22 -0800 Subject: [PATCH 04/21] Fix sof-apl-eq-dmic comments Fix copy paste comment errors Signed-off-by: Curtis Malainey --- topology/sof-apl-eq-dmic.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 42e9bd979df72f6220995cc52e7011960d72b4bb Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:15:46 -0800 Subject: [PATCH 05/21] Fix sof-apl-eq-pcm512x comments Fix copy paste errors Signed-off-by: Curtis Malainey --- topology/sof-apl-eq-pcm512x.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 79252d6c466f20bb8c3965fb3e075d2d752a4d1f Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:19:57 -0800 Subject: [PATCH 06/21] Fix sof-apl-nocodec comments Follow graph convention in other files as well as fix typos and comments Signed-off-by: Curtis Malainey --- topology/sof-apl-nocodec.m4 | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) 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) # From af9d2d4e5719b3b225e0546d5698cd2c5952d2c2 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:22:45 -0800 Subject: [PATCH 07/21] Fix sof-apl-pcm512x Fix graph to reflect file Signed-off-by: Curtis Malainey --- topology/sof-apl-pcm512x.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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, From 5452897dc9308c7e4fd4e17649550dec880eacdb Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:32:29 -0800 Subject: [PATCH 08/21] update sof-apl-tdf8532 consolidate graph styles Signed-off-by: Curtis Malainey --- topology/sof-apl-tdf8532.m4 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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. From 888260a768ef65652f0b821cbd66fe315a423669 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:37:51 -0800 Subject: [PATCH 09/21] Update comments for sof-bdw-rt286 Update header to reflect code Signed-off-by: Curtis Malainey --- topology/sof-bdw-rt286.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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. From 9f210ad755e5fa0b2f56ceef82ce5a3a1da1306f Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:51:43 -0800 Subject: [PATCH 10/21] Update sof-byt-da7213 Update graph to represent code Signed-off-by: Curtis Malainey --- topology/sof-byt-da7213.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From d5ac458f56ac6d16cd42bab8b3b4fbdbeb27a29b Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 15 Nov 2018 18:52:35 -0800 Subject: [PATCH 11/21] Update sof-byt-nocodec Make it clearer that there is no codec as well as update the media graph Signed-off-by: Curtis Malainey --- topology/sof-byt-nocodec.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. From 141493604af59eac5db94c0f75adf061c840c021 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:02:58 -0800 Subject: [PATCH 12/21] Update sof-byt-rt5640 graph correct graph Signed-off-by: Curtis Malainey --- topology/sof-byt-rt5640.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From adf6db4d859c8d496f451a949ce30a2a995b8497 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:06:45 -0800 Subject: [PATCH 13/21] Update sof-byt-rt5645 graph update graph to represent code Signed-off-by: Curtis Malainey --- topology/sof-byt-rt5645.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. From f18a895aec7610da51f78c72cb7b220fb21d18ac Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:08:11 -0800 Subject: [PATCH 14/21] Update sof-byt-rt5651 Correct graph Signed-off-by: Curtis Malainey --- topology/sof-byt-rt5651.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 3560320ca3d411e720858326455c99ff121bb391 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:11:58 -0800 Subject: [PATCH 15/21] Update sof-cht-max98090 graph Update to properly reflect code Signed-off-by: Curtis Malainey --- topology/sof-cht-max98090.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 2331cfaf9eb292b6cad8d688734e164aaf5d984c Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:14:03 -0800 Subject: [PATCH 16/21] Update sof-cht-nocodec Update graph comments Signed-off-by: Curtis Malainey --- topology/sof-cht-nocodec.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. From c304613744981fe0ea385ed1efa234ac2f42786e Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:17:45 -0800 Subject: [PATCH 17/21] Update sof-cnl-rt274 Update graph to represent actual layout Signed-off-by: Curtis Malainey --- topology/sof-cnl-rt274.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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. From c1c68420369748fedf74a6cb2d94e5b19fa3dab1 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:22:34 -0800 Subject: [PATCH 18/21] Update sof-glk-da7219 Update graph and comments Signed-off-by: Curtis Malainey --- topology/sof-glk-da7219.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From 25e6b20f03d60f9fbb978b03a548db340787ea40 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:24:32 -0800 Subject: [PATCH 19/21] Fix sof-apl-da7219 typo Signed-off-by: Curtis Malainey --- topology/sof-apl-da7219.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4194dae527d628efde6394ab40c19f373b862230 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:27:33 -0800 Subject: [PATCH 20/21] Update sof-hsw-rt5640 Update comments and graph Signed-off-by: Curtis Malainey --- topology/sof-hsw-rt5640.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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. From d710f99de98b57619556db5aca36e367daeba6af Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Fri, 16 Nov 2018 15:28:47 -0800 Subject: [PATCH 21/21] Update sof-icl-nocodec Update graph Signed-off-by: Curtis Malainey --- topology/sof-icl-nocodec.m4 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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.