topology2: split deep buffer speaker from deep-buffer.conf

The existing code assumes that deep buffer jack is always there if deep
buffer is enabled. But amp function topology only needs deep buffer
speaker. Split deep buffer speaker from the deep-buffer.conf will make
us be easier to add deep buffer speaker into the amp function topology.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Author: bardliao

tools/topology/topology2/platform/intel/deep-buffer-spk.conf

@@ -0,0 +1,59 @@
+Define {
+	SPEAKER_PCM_CORE_ID		0
+}
+
+Object.Pipeline.deepbuffer-playback [
+	{
+		index $DEEP_BUFFER_PIPELINE_ID_2
+		core_id $SPEAKER_PCM_CORE_ID
+
+		Object.Widget.host-copier.1 {
+			stream_name $DEEP_BUFFER_PCM_NAME_2
+			pcm_id $DEEP_BUFFER_PCM_ID_2
+		}
+		Object.Widget.gain.1 {
+			Object.Control.mixer.1 {
+				name 'Pre Mixer $DEEP_BUFFER_PCM_NAME_2 Volume'
+			}
+		}
+		Object.Widget.pipeline.1 {
+			core $SPEAKER_PCM_CORE_ID
+		}
+	}
+]
+
+Object.PCM.pcm [
+	{
+		name $DEEP_BUFFER_PCM_NAME_2
+		id $DEEP_BUFFER_PCM_ID_2
+		direction playback
+		playback_compatible_d0i3 $DEEPBUFFER_D0I3_COMPATIBLE
+
+		Object.Base.fe_dai.1 {
+			name "$DEEP_BUFFER_PCM_NAME_2"
+		}
+		Object.PCM.pcm_caps.1 {
+			name $DEEP_BUFFER_PCM_NAME_2
+			formats 'S16_LE,S24_LE,S32_LE'
+			# To avoid DMA spinning on a buffer we need bigger
+			# buffer than the host buffer size, let's say twice as
+			# big
+			# (S16_LE, Stereo, 48KHz, DEEPBUFFER_FW_DMA_MS) * 2
+			#
+			# Note: The lower limit for the buffer size is rate
+			#	dependent
+			buffer_size_min "$[(((2 * $channels_min) * 48) * $DEEPBUFFER_FW_DMA_MS) * 2]"
+		}
+	}
+]
+
+Object.Base.route [
+	{
+		source  $DEEP_BUFFER_PIPELINE_SRC_2
+		sink	$DEEP_BUFFER_PIPELINE_SINK_2
+	}
+	{
+		source  host-copier.$DEEP_BUFFER_PCM_ID_2.playback
+		sink	gain.$DEEP_BUFFER_PIPELINE_ID_2.1
+	}
+]

tools/topology/topology2/platform/intel/deep-buffer.conf

@@ -164,65 +164,5 @@ Object.Base.route [
 
 # Spawn another instance
 IncludeByKey.DEEP_BUF_SPK {
-"true"	{
-		Define {
-			SPEAKER_PCM_CORE_ID		0
-		}
-
-		Object.Pipeline.deepbuffer-playback [
-			{
-				index $DEEP_BUFFER_PIPELINE_ID_2
-				core_id $SPEAKER_PCM_CORE_ID
-
-				Object.Widget.host-copier.1 {
-					stream_name $DEEP_BUFFER_PCM_NAME_2
-					pcm_id $DEEP_BUFFER_PCM_ID_2
-				}
-				Object.Widget.gain.1 {
-					Object.Control.mixer.1 {
-						name 'Pre Mixer $DEEP_BUFFER_PCM_NAME_2 Volume'
-					}
-				}
-				Object.Widget.pipeline.1 {
-					core $SPEAKER_PCM_CORE_ID
-				}
-			}
-		]
-
-		Object.PCM.pcm [
-			{
-				name $DEEP_BUFFER_PCM_NAME_2
-				id $DEEP_BUFFER_PCM_ID_2
-				direction playback
-				playback_compatible_d0i3 $DEEPBUFFER_D0I3_COMPATIBLE
-
-				Object.Base.fe_dai.1 {
-					name "$DEEP_BUFFER_PCM_NAME_2"
-				}
-				Object.PCM.pcm_caps.1 {
-					name $DEEP_BUFFER_PCM_NAME_2
-					formats 'S16_LE,S24_LE,S32_LE'
-					# To avoid DMA spinning on a buffer we need bigger
-					# buffer than the host buffer size, let's say twice as
-					# big
-					# (S16_LE, Stereo, 48KHz, DEEPBUFFER_FW_DMA_MS) * 2
-					#
-					# Note: The lower limit for the buffer size is rate
-					#	dependent
-					buffer_size_min "$[(((2 * $channels_min) * 48) * $DEEPBUFFER_FW_DMA_MS) * 2]"
-				}
-			}
-		]
-
-		Object.Base.route [
-			{
-				source  $DEEP_BUFFER_PIPELINE_SRC_2
-				sink	$DEEP_BUFFER_PIPELINE_SINK_2
-			}
-			{
-				source  host-copier.$DEEP_BUFFER_PCM_ID_2.playback
-				sink	gain.$DEEP_BUFFER_PIPELINE_ID_2.1
-			}
-		]
-	}
+"true" "platform/intel/deep-buffer-spk.conf"
 }