topology2: Make name a mandatory attribute in hw_config

Add an instance attribute and make the name attribute mandatory for the
hw_config objects. This is required because the topology2 compiler allows
for expansion of string values with variable definitions. So, if we
wanted to expand the name from a variable definition(as shown below), it
is only possible if it were a normal attribute instead of the node ID as
it is currently.

Define {
	SSP0_HW_CONFIG_NAME	"SSP0"
}
Object.DAI.SSP.1 {
	dai_index 0
	Object.Base.hw_config.1 {
		name $SSP0_HW_CONFIG_NAME
	}
}

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

tools/topology/topology2/cavs-mixin-mixout-hda.conf

@@ -20,7 +20,9 @@ Object.Dai {
 		dai_index 0
 		id 4
 		default_hw_conf_id 4
-		Object.Base.hw_config.HDA0 {}
+		Object.Base.hw_config.1 {
+			name	"HDA0"
+		}
 		direction duplex
 	}
 }

tools/topology/topology2/cavs-nocodec.conf

@@ -87,7 +87,8 @@ Object.Dai {
 		quirks			"lbm_mode"
 		io_clk		$MCLK
 
-		Object.Base.hw_config."SSP0" {
+		Object.Base.hw_config.1 {
+			name	"SSP0"
 			id	0
 			mclk_freq	$MCLK
 			bclk_freq	3072000
@@ -104,7 +105,8 @@ Object.Dai {
 		quirks			"lbm_mode"
 		io_clk		$MCLK
 
-		Object.Base.hw_config."SSP1" {
+		Object.Base.hw_config.1 {
+			name	"SSP1"
 			id	0
 			mclk_freq	$MCLK
 			bclk_freq	3072000
@@ -121,7 +123,8 @@ Object.Dai {
 		quirks			"lbm_mode"
 		io_clk		$MCLK
 
-		Object.Base.hw_config."SSP2" {
+		Object.Base.hw_config.1 {
+			name	"SSP2"
 			id	0
 			mclk_freq	$MCLK
 			bclk_freq	3072000

tools/topology/topology2/cavs-rt5682.conf

@@ -96,7 +96,8 @@ Object.Dai {
 		sample_bits		32
 		io_clk		$MCLK
 
-		Object.Base.hw_config."SSP0" {
+		Object.Base.hw_config.1 {
+			name	"SSP0"
 			id	0
 			mclk_freq	$MCLK
 			bclk_freq	3072000
@@ -112,7 +113,8 @@ Object.Dai {
 		sample_bits		32
 		io_clk		$MCLK
 
-		Object.Base.hw_config."SSP1" {
+		Object.Base.hw_config.1 {
+			name	"SSP1"
 			id	0
 			mclk_freq	$MCLK
 			bclk_freq	3072000

tools/topology/topology2/cavs-sdw-src-gain-mixin.conf

@@ -48,8 +48,9 @@ Object.Dai {
 		rate			48000
 		channels		2
 
-		Object.Base.hw_config."ALH2" {
+		Object.Base.hw_config.1 {
 			id	0
+			name	"ALH2"
 		}
 	}
 	ALH."3" {
@@ -61,8 +62,9 @@ Object.Dai {
 		rate			48000
 		channels		2
 
-		Object.Base.hw_config."ALH3" {
+		Object.Base.hw_config.1 {
 			id	1
+			name	ALH3
 		}
 	}
 }

tools/topology/topology2/cavs-sdw.conf

@@ -108,8 +108,9 @@ Object.Dai {
 		rate			48000
 		channels		2
 
-		Object.Base.hw_config."ALH2" {
+		Object.Base.hw_config.1 {
 			id	0
+			name	"ALH2"
 		}
 	}
 	ALH."3" {
@@ -121,8 +122,9 @@ Object.Dai {
 		rate			48000
 		channels		2
 
-		Object.Base.hw_config."ALH3" {
+		Object.Base.hw_config.1 {
 			id	1
+			name	"ALH3"
 		}
 	}
 }

tools/topology/topology2/include/dais/hw_config.conf

@@ -16,6 +16,7 @@ Class.Base."hw_config" {
 	# Argument used to construct hw config (hw config ID)
 	#
 	DefineAttribute."id" {}
+	DefineAttribute."instance" {}
 
 	DefineAttribute."name" {
 		type	"string"
@@ -63,11 +64,14 @@ Class.Base."hw_config" {
 		!constructor [
 			"id"
 		]
+		!mandatory [
+			"name"
+		]
 		#
 		# hw_cfg objects instantiated within the same alsaconf node must have unique
-		# 'name' attribute
+		# 'instance' attribute
 		#
-		unique	"name"
+		unique	"instance"
 	}
 
 	#TODO: Add link flags

tools/topology/topology2/platform/intel/dmic-generic.conf

@@ -12,8 +12,9 @@ Object.Dai {
 		# the mic's are enabled or disabled in each PDM.
 		num_pdm_active 	2
 
-		Object.Base.hw_config."DMIC0" {
+		Object.Base.hw_config.1 {
 			id	0
+			name	"DMIC0"
 		}
 
 		# PDM controller config
@@ -45,8 +46,9 @@ Object.Dai {
                # the mic's are enabled or disabled in each PDM.
                num_pdm_active  2
 
-               Object.Base.hw_config."DMIC1" {
+               Object.Base.hw_config.1 {
                        id      0
+			name	"DMIC1"
                }
 
                # PDM controller config

tools/topology/topology2/platform/intel/hdmi-4th.conf

@@ -4,7 +4,9 @@ Object.Dai {
 		name iDisp4
 		id $HDMI4_ID
 		default_hw_conf_id 3
-		Object.Base.hw_config.HDA6 {}
+		Object.Base.hw_config.1 {
+			name	"HDA6"
+		}
 		direction playback
 	}
 }

tools/topology/topology2/platform/intel/hdmi-generic.conf

@@ -4,23 +4,29 @@ Object.Dai {
 		name iDisp1
 		id $HDMI1_ID
 		default_hw_conf_id 1
-		Object.Base.hw_config.HDA4 {}
+		Object.Base.hw_config.1 {
+			name	"HDA4"
+		}
 		direction playback
 	}
 	HDA.5 {
 		dai_index 5
 		name iDisp2
 		id $HDMI2_ID
 		default_hw_conf_id 2
-		Object.Base.hw_config.HDA5 {}
+		Object.Base.hw_config.1 {
+			name	"HDA5"
+		}
 		direction playback
 	}
 	HDA.6 {
 		dai_index 6
 		name iDisp3
 		id $HDMI3_ID
 		default_hw_conf_id 3
-		Object.Base.hw_config.HDA6 {}
+		Object.Base.hw_config.1 {
+			name	"HDA6"
+		}
 		direction playback
 	}
 }

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

@@ -20,8 +20,9 @@ Object.Dai {
 		rate			48000
 		channels		2
 
-		Object.Base.hw_config."ALH514" {
+		Object.Base.hw_config.1 {
 			id	0
+			name	"ALH514"
 		}
 	}
 	ALH."2" {
@@ -33,8 +34,9 @@ Object.Dai {
 		rate			48000
 		channels		2
 
-		Object.Base.hw_config."ALH515" {
+		Object.Base.hw_config.1 {
 			id	1
+			name	"ALH515"
 		}
 	}
 }