[Sound-open-firmware] [PATCH] topology: remove unused secondary media pcm

7 Dec 2017

Secondary PCM not used atm for 1.0 release so temporarily remove from standard
topologies.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com
---
 topology/reef-apl-nocodec.m4 | 11 -----------
 topology/reef-bdw-rt286.m4   | 11 -----------
 topology/reef-bdw-rt5640.m4  | 11 -----------
 topology/reef-bxt-nocodec.m4 | 11 -----------
 topology/reef-hsw-rt5640.m4  | 11 -----------
 5 files changed, 55 deletions(-)

diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4
index 89ac0b0..d4ac613 100644
--- a/topology/reef-apl-nocodec.m4
+++ b/topology/reef-apl-nocodec.m4
@@ -22,8 +22,6 @@ include(`dsps/bxt.m4')
 #                                  |--low latency mixer ----> volume ---->  SSP2
 # PCM2 ----> SRC -----> volume ----+
 #                                  |
-# PCM3 ----> SRC -----> volume ----+
-#                                  |
 #           Tone -----> volume ----+
 #
 # PCM1 <---- Volume <---- SSP2
@@ -50,13 +48,6 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
    96, 2000, 1, 0, 0, 3)
-# PCM Media Playback pipeline 4 on PCM 2 using max 2 channels of s32le.
-# Schedule 96 frames per 2000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 4 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
-	4, 2, 2, s32le,
-	96, 2000, 1, 0, 0, 4)
-
 # Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
 PIPELINE_ADD(sof/pipe-tone.m4,
@@ -70,8 +61,6 @@ SectionGraph."pipe-apl-nocodec" {
    lines [
    	# media 0
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
-		# media 1
-		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4)
    	#tone
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
    ]
diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4
index 969d5e0..eaba2d9 100644
--- a/topology/reef-bdw-rt286.m4
+++ b/topology/reef-bdw-rt286.m4
@@ -22,8 +22,6 @@ include(`dsps/bdw.m4')
 #                                  |--low latency mixer ----> volume ---->  SSP2
 # PCM2 ----> SRC -----> volume ----+
 #                                  |
-# PCM3 ----> SRC -----> volume ----+
-#                                  |
 #           Tone -----> volume ----+
 #
 # PCM1 <---- Volume <---- SSP0
@@ -50,13 +48,6 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
    96, 2000, 1, 0, 0, 3)
-# PCM Media Playback pipeline 4 on PCM 2 using max 2 channels of s32le.
-# Schedule 96 frames per 2000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 4 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
-	4, 2, 2, s32le,
-	96, 2000, 1, 0, 0, 4)
-
 # Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
 PIPELINE_ADD(sof/pipe-tone.m4,
@@ -70,8 +61,6 @@ SectionGraph."pipe-bdw-rt286" {
    lines [
    	# media 0
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
-		# media 1
-		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4)
    	#tone
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
    ]
diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4
index acf2462..5d4485b 100644
--- a/topology/reef-bdw-rt5640.m4
+++ b/topology/reef-bdw-rt5640.m4
@@ -22,8 +22,6 @@ include(`dsps/bdw.m4')
 #                                  |--low latency mixer ----> volume ---->  SSP2
 # PCM2 ----> SRC -----> volume ----+
 #                                  |
-# PCM3 ----> SRC -----> volume ----+
-#                                  |
 #           Tone -----> volume ----+
 #
 # PCM1 <---- Volume <---- SSP0
@@ -50,13 +48,6 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
    96, 2000, 1, 0, 0, 3)
-# PCM Media Playback pipeline 4 on PCM 2 using max 2 channels of s32le.
-# Schedule 96 frames per 2000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 4 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
-	4, 2, 2, s32le,
-	96, 2000, 1, 0, 0, 4)
-
 # Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
 PIPELINE_ADD(sof/pipe-tone.m4,
@@ -70,8 +61,6 @@ SectionGraph."pipe-bdw-rt5640" {
    lines [
    	# media 0
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
-		# media 1
-		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4)
    	#tone
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
    ]
diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4
index 86cc364..dbac98a 100644
--- a/topology/reef-bxt-nocodec.m4
+++ b/topology/reef-bxt-nocodec.m4
@@ -22,8 +22,6 @@ include(`dsps/bxt.m4')
 #                                  |--low latency mixer ----> volume ---->  SSP2
 # PCM2 ----> SRC -----> volume ----+
 #                                  |
-# PCM3 ----> SRC -----> volume ----+
-#                                  |
 #           Tone -----> volume ----+
 #
 # PCM1 <---- Volume <---- SSP2
@@ -50,13 +48,6 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
    192, 4000, 1, 0, 0, 3)
-# PCM Media Playback pipeline 4 on PCM 2 using max 2 channels of s32le.
-# Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
-	3, 2, 2, s32le,
-	192, 4000, 1, 0, 0, 4)
-
 # Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
 PIPELINE_ADD(sof/pipe-tone.m4,
@@ -70,8 +61,6 @@ SectionGraph."pipe-bxt-nocodec" {
    lines [
    	# media 0
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
-		# media 1
-		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4)
    	#tone
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
    ]
diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4
index 8759704..663686b 100644
--- a/topology/reef-hsw-rt5640.m4
+++ b/topology/reef-hsw-rt5640.m4
@@ -22,8 +22,6 @@ include(`dsps/hsw.m4')
 #                                  |--low latency mixer ----> volume ---->  SSP2
 # PCM2 ----> SRC -----> volume ----+
 #                                  |
-# PCM3 ----> SRC -----> volume ----+
-#                                  |
 #           Tone -----> volume ----+
 #
 # PCM1 <---- Volume <---- SSP0
@@ -50,13 +48,6 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
    3, 1, 2, s32le,
    192, 4000, 1, 0, 0, 3)
-# PCM Media Playback pipeline 4 on PCM 2 using max 2 channels of s32le.
-# Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
-	4, 2, 2, s32le,
-	192, 4000, 1, 0, 0, 4)
-
 # Tone Playback pipeline 5 using max 2 channels of s32le.
 # Schedule 192 frames per 4000us deadline on core 0 with priority 2
 PIPELINE_ADD(sof/pipe-tone.m4,
@@ -70,8 +61,6 @@ SectionGraph."pipe-hsw-rt5640" {
    lines [
    	# media 0
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
-		# media 1
-		dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_4)
    	#tone
    	dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
    ]
-- 
2.14.1


    

Liam Girdwood

tags (0)

participants (1)