topology2: sdw-amp-generic: always create module-copier.1.22

This is a preparation commit for creating a stand alone echo reference topology.
module-copier.1.22 is used by the echo reference, but it is harmless to
create it and connect it to the no echo reference topology. And then we
can connect the echo reference pipeline to module-copier.1.22 is echo
reference is needed.

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

Author: bardliao

tools/topology/topology2/platform/intel/sdw-amp-generic.conf

@@ -54,6 +54,26 @@ Object.Dai.ALH [
 	}
 ]
 
+Object.Widget.module-copier."22" {
+	index 21
+	num_input_pins 1
+	num_output_pins 2
+	num_input_audio_formats 1
+	num_output_audio_formats 1
+	Object.Base.input_audio_format [
+		{
+			in_bit_depth		32
+			in_valid_bit_depth	32
+		}
+	]
+	Object.Base.output_audio_format [
+		{
+			out_bit_depth		32
+			out_valid_bit_depth	32
+		}
+	]
+}
+
 IncludeByKey.PASSTHROUGH {
 "false" {
 	Object.Pipeline {
@@ -737,41 +757,25 @@ Object.PCM.pcm [
 
 IncludeByKey.PASSTHROUGH {
 	"false" {
-		IncludeByKey.SDW_SPK_ECHO_REF {
+		IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
 			"true" {
-				IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
+				IncludeByKey.USE_DAX {
 					"true" {
-						IncludeByKey.USE_DAX {
-							"true" {
-								Object.Base.route [
-									{
-										source	"dolby-dax.21.1"
-										sink	"module-copier.21.22"
-									}
-									{
-										source	"module-copier.21.22"
-										sink	"alh-copier.$SDW_SPK_STREAM.0"
-									}
-								]
+						Object.Base.route [
+							{
+								source	"dolby-dax.21.1"
+								sink	"module-copier.21.22"
 							}
-							"false" {
-								Object.Base.route [
-									{
-										source	"drc.21.1"
-										sink	"module-copier.21.22"
-									}
-									{
-										source	"module-copier.21.22"
-										sink	"alh-copier.$SDW_SPK_STREAM.0"
-									}
-								]
+							{
+								source	"module-copier.21.22"
+								sink	"alh-copier.$SDW_SPK_STREAM.0"
 							}
-						}
+						]
 					}
 					"false" {
 						Object.Base.route [
 							{
-								source	"gain.21.1"
+								source	"drc.21.1"
 								sink	"module-copier.21.22"
 							}
 							{
@@ -783,36 +787,16 @@ IncludeByKey.PASSTHROUGH {
 				}
 			}
 			"false" {
-				IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
-					"true" {
-						IncludeByKey.USE_DAX {
-							"true" {
-								Object.Base.route [
-									{
-										source	"dolby-dax.21.1"
-										sink	"alh-copier.$SDW_SPK_STREAM.0"
-									}
-								]
-							}
-							"false" {
-								Object.Base.route [
-									{
-										source	"drc.21.1"
-										sink	"alh-copier.$SDW_SPK_STREAM.0"
-									}
-								]
-							}
-						}
+				Object.Base.route [
+					{
+						source	"gain.21.1"
+						sink	"module-copier.21.22"
 					}
-					"false" {
-						Object.Base.route [
-							{
-								source	"gain.21.1"
-								sink	"alh-copier.$SDW_SPK_STREAM.0"
-							}
-						]
+					{
+						source	"module-copier.21.22"
+						sink	"alh-copier.$SDW_SPK_STREAM.0"
 					}
-				}
+				]
 			}
 		}
 		Object.Base.route [
@@ -1048,26 +1032,6 @@ IncludeByKey.SDW_AMP_FEEDBACK {
 
 IncludeByKey.SDW_SPK_ECHO_REF {
 	"true" {
-		Object.Widget.module-copier."22" {
-			index 21
-			num_input_pins 1
-			num_output_pins 2
-			num_input_audio_formats 1
-			num_output_audio_formats 1
-			Object.Base.input_audio_format [
-				{
-					in_bit_depth		32
-					in_valid_bit_depth	32
-				}
-			]
-			Object.Base.output_audio_format [
-				{
-					out_bit_depth		32
-					out_valid_bit_depth	32
-				}
-			]
-		}
-
 		Object.Pipeline {
 			siggen-host-copier-capture [
 				{