topology: rename dax control names

checkupup · kv2019i · commit 9ee2d5dde537 · 2026-03-09T10:00:28.000+02:00
Rename DAX control names with Speaker and
Headphone.

Signed-off-by: Jun Lai &lt;jun.lai@dolby.com&gt;
diff --git a/tools/topology/topology2/cavs-mixin-mixout-dax-ssp.conf b/tools/topology/topology2/cavs-mixin-mixout-dax-ssp.conf
@@ -88,27 +88,26 @@ Object.Pipeline {
 				core_id $DOLBY_DAX_CORE_ID
 				Object.Control {
 					mixer."1" {
-						name 'DAX $HEADSET_PCM_NAME Playback Switch'
+						name 'DAX Headphone Switch'
 					}
 					mixer."2" {
-						name 'DAX $HEADSET_PCM_NAME Playback Switch CP'
+						name 'DAX Headphone Switch CP'
 					}
 					mixer."3" {
-						name 'DAX $HEADSET_PCM_NAME Playback Switch CTC'
+						name 'DAX Headphone Switch CTC'
 					}
 					mixer."4" {
-						name 'DAX $HEADSET_PCM_NAME Playback Volume'
+						name 'DAX Headphone Volume'
 					}
 					enum."1" {
-						name 'DAX $HEADSET_PCM_NAME Playback Profile'
+						name 'DAX Headphone Profile'
 					}
 					enum."2" {
-						name 'DAX $HEADSET_PCM_NAME Playback Device'
+						name 'DAX Headphone Device'
 					}
 					bytes."1" {
-						name 'DAX $HEADSET_PCM_NAME Playback Tuning'
+						name 'DAX Headphone Tuning'
 						max 8192
-						<include/components/dax/default.conf>
 					}
 				}
 			}
@@ -155,27 +154,26 @@ Object.Pipeline {
 				core_id $DOLBY_DAX_CORE_ID
 				Object.Control {
 					mixer."1" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Switch'
+						name 'DAX Speaker Switch'
 					}
 					mixer."2" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Switch CP'
+						name 'DAX Speaker Switch CP'
 					}
 					mixer."3" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Switch CTC'
+						name 'DAX Speaker Switch CTC'
 					}
 					mixer."4" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Volume'
+						name 'DAX Speaker Volume'
 					}
 					enum."1" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Profile'
+						name 'DAX Speaker Profile'
 					}
 					enum."2" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Device'
+						name 'DAX Speaker Device'
 					}
 					bytes."1" {
-						name 'DAX $SPEAKER_PCM_NAME Playback Tuning'
+						name 'DAX Speaker Tuning'
 						max 8192
-						<include/components/dax/default.conf>
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -88,27 +88,26 @@ Object.Pipeline {`
`88`	`88`	`core_id $DOLBY_DAX_CORE_ID`
`89`	`89`	`Object.Control {`
`90`	`90`	`mixer."1" {`
`91`		`- name 'DAX $HEADSET_PCM_NAME Playback Switch'`
	`91`	`+ name 'DAX Headphone Switch'`
`92`	`92`	`}`
`93`	`93`	`mixer."2" {`
`94`		`- name 'DAX $HEADSET_PCM_NAME Playback Switch CP'`
	`94`	`+ name 'DAX Headphone Switch CP'`
`95`	`95`	`}`
`96`	`96`	`mixer."3" {`
`97`		`- name 'DAX $HEADSET_PCM_NAME Playback Switch CTC'`
	`97`	`+ name 'DAX Headphone Switch CTC'`
`98`	`98`	`}`
`99`	`99`	`mixer."4" {`
`100`		`- name 'DAX $HEADSET_PCM_NAME Playback Volume'`
	`100`	`+ name 'DAX Headphone Volume'`
`101`	`101`	`}`
`102`	`102`	`enum."1" {`
`103`		`- name 'DAX $HEADSET_PCM_NAME Playback Profile'`
	`103`	`+ name 'DAX Headphone Profile'`
`104`	`104`	`}`
`105`	`105`	`enum."2" {`
`106`		`- name 'DAX $HEADSET_PCM_NAME Playback Device'`
	`106`	`+ name 'DAX Headphone Device'`
`107`	`107`	`}`
`108`	`108`	`bytes."1" {`
`109`		`- name 'DAX $HEADSET_PCM_NAME Playback Tuning'`
	`109`	`+ name 'DAX Headphone Tuning'`
`110`	`110`	`max 8192`
`111`		`- <include/components/dax/default.conf>`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`	`}`
`@@ -155,27 +154,26 @@ Object.Pipeline {`
`155`	`154`	`core_id $DOLBY_DAX_CORE_ID`
`156`	`155`	`Object.Control {`
`157`	`156`	`mixer."1" {`
`158`		`- name 'DAX $SPEAKER_PCM_NAME Playback Switch'`
	`157`	`+ name 'DAX Speaker Switch'`
`159`	`158`	`}`
`160`	`159`	`mixer."2" {`
`161`		`- name 'DAX $SPEAKER_PCM_NAME Playback Switch CP'`
	`160`	`+ name 'DAX Speaker Switch CP'`
`162`	`161`	`}`
`163`	`162`	`mixer."3" {`
`164`		`- name 'DAX $SPEAKER_PCM_NAME Playback Switch CTC'`
	`163`	`+ name 'DAX Speaker Switch CTC'`
`165`	`164`	`}`
`166`	`165`	`mixer."4" {`
`167`		`- name 'DAX $SPEAKER_PCM_NAME Playback Volume'`
	`166`	`+ name 'DAX Speaker Volume'`
`168`	`167`	`}`
`169`	`168`	`enum."1" {`
`170`		`- name 'DAX $SPEAKER_PCM_NAME Playback Profile'`
	`169`	`+ name 'DAX Speaker Profile'`
`171`	`170`	`}`
`172`	`171`	`enum."2" {`
`173`		`- name 'DAX $SPEAKER_PCM_NAME Playback Device'`
	`172`	`+ name 'DAX Speaker Device'`
`174`	`173`	`}`
`175`	`174`	`bytes."1" {`
`176`		`- name 'DAX $SPEAKER_PCM_NAME Playback Tuning'`
	`175`	`+ name 'DAX Speaker Tuning'`
`177`	`176`	`max 8192`
`178`		`- <include/components/dax/default.conf>`
`179`	`177`	`}`
`180`	`178`	`}`
`181`	`179`	`}`