TEST: topology2: bluetooth: Add BT LE 24K Unicast support

Add BT-LE-24K-STEREO playback support. DSP is master on I2S. Signed-off-by: Yong Zhi <yong.zhi@intel.com>
yongzhi1 · Jun 12, 2024 · 3e5d901 · 3e5d901
1 parent 84dfa16
commit 3e5d901
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 15 deletions.
diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf
@@ -22,8 +22,8 @@ Object.Pipeline {
 				copier_type    "SSP"
 				stream_name    $BT_NAME
 				node_type      $I2S_LINK_OUTPUT_CLASS
-				num_input_audio_formats 3
-				num_output_audio_formats 3
+				num_input_audio_formats 4
+				num_output_audio_formats 4
 				num_input_pins 1
 
 				CombineArrays.Object.Base.output_audio_format [
@@ -35,8 +35,12 @@ Object.Pipeline {
 						]
 						out_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24K/48k
 					{
+						out_rate [
+							24000
+							48000
+						]
 						out_bit_depth		[ 16 ]
 						out_valid_bit_depth	[ 16 ]
 						out_channels		[ 2 ]
@@ -51,8 +55,12 @@ Object.Pipeline {
 						]
 						in_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24k/48k
 					{
+						in_rate [
+							24000
+							48000
+						]
 						in_bit_depth		[ 16 ]
 						in_valid_bit_depth	[ 16 ]
 						in_channels		[ 2 ]
@@ -71,8 +79,8 @@ Object.Pipeline {
 			Object.Widget.host-copier.1 {
 				stream_name $BT_PB_PCM_CAPS
 				pcm_id $BT_PCM_ID
-				num_input_audio_formats 3
-				num_output_audio_formats 3
+				num_input_audio_formats 4
+				num_output_audio_formats 4
 				CombineArrays.Object.Base.output_audio_format [
 					# array of 2ch format with range of rates
 					{
@@ -82,8 +90,12 @@ Object.Pipeline {
 						]
 						out_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24k/48k
 					{
+						out_rate [
+							24000
+							48000
+						]
 						out_bit_depth		[ 16 ]
 						out_valid_bit_depth	[ 16 ]
 						out_channels		[ 2 ]
@@ -98,8 +110,12 @@ Object.Pipeline {
 						]
 						in_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24k/48k
 					{
+						in_rate [
+							24000
+							48000
+						]
 						in_bit_depth		[ 16 ]
 						in_valid_bit_depth	[ 16 ]
 						in_channels		[ 2 ]
@@ -119,8 +135,8 @@ Object.Pipeline {
 			Object.Widget.host-copier.1 {
 				stream_name $BT_CP_PCM_CAPS
 				pcm_id	$BT_PCM_ID
-				num_input_audio_formats 3
-				num_output_audio_formats 3
+				num_input_audio_formats 4
+				num_output_audio_formats 4
 				CombineArrays.Object.Base.output_audio_format [
 					# array of 2ch format with range of rates
 					{
@@ -132,6 +148,10 @@ Object.Pipeline {
 					}
 					# 2ch 16-bit 48k
 					{
+						out_rate [
+							24000
+							48000
+						]
 						out_bit_depth		[ 16 ]
 						out_valid_bit_depth	[ 16 ]
 						out_channels		[ 2 ]
@@ -146,8 +166,12 @@ Object.Pipeline {
 						]
 						in_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24k/48k
 					{
+						in_rate [
+							24000
+							48000
+						]
 						in_bit_depth		[ 16 ]
 						in_valid_bit_depth	[ 16 ]
 						in_channels		[ 2 ]
@@ -172,8 +196,8 @@ Object.Pipeline {
 				copier_type	"SSP"
 				stream_name	$BT_NAME
 				node_type	$I2S_LINK_INPUT_CLASS
-				num_input_audio_formats 3
-				num_output_audio_formats 3
+				num_input_audio_formats 4
+				num_output_audio_formats 4
 				CombineArrays.Object.Base.output_audio_format [
 					# array of 2ch format with range of rates
 					{
@@ -183,8 +207,12 @@ Object.Pipeline {
 						]
 						out_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24k/48k
 					{
+						out_rate [
+							24000
+							48000
+						]
 						out_bit_depth		[ 16 ]
 						out_valid_bit_depth	[ 16 ]
 						out_channels		[ 2 ]
@@ -199,8 +227,12 @@ Object.Pipeline {
 						]
 						in_channels [ 1 ]
 					}
-					# 2ch 16-bit 48k
+					# 2ch 16-bit 24k/48k
 					{
+						in_rate [
+							24000
+							48000
+						]
 						in_bit_depth		[ 16 ]
 						in_valid_bit_depth	[ 16 ]
 						in_channels		[ 2 ]

diff --git a/tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf b/tools/topology/topology2/platform/intel/bt-ssp-config-lbm.conf
@@ -61,5 +61,22 @@ Object.Dai.SSP [
 				clock_source	1
 			}
 		}
+		Object.Base.hw_config.4 {
+			id		3
+			name		"BT-LE-24K-STEREO"
+			mclk_freq	$BT_MCLK
+			bclk_freq	768000
+			tdm_slot_width	16
+			format		"DSP_A"
+			bclk		"codec_consumer"
+			fsync		"codec_consumer"
+			fsync_freq	24000
+			tdm_slots	2
+			tx_slots	3
+			rx_slots	3
+			Object.Base.link_config.1 {
+				clock_source	1
+			}
+		}
 	}
 ]
diff --git a/tools/topology/topology2/platform/intel/bt-ssp-config.conf b/tools/topology/topology2/platform/intel/bt-ssp-config.conf
@@ -60,5 +60,22 @@ Object.Dai.SSP [
 				clock_source	1
 			}
 		}
+		Object.Base.hw_config.4 {
+			id		3
+			name		"BT-LE-24K-STEREO"
+			mclk_freq	$BT_MCLK
+			bclk_freq	768000
+			tdm_slot_width	16
+			format		"DSP_A"
+			bclk		"codec_consumer"
+			fsync		"codec_consumer"
+			fsync_freq	24000
+			tdm_slots	2
+			tx_slots	3
+			rx_slots	0
+			Object.Base.link_config.1 {
+				clock_source	1
+			}
+		}
 	}
 ]