mirror of
				https://github.com/alsa-project/alsa-lib.git
				synced 2025-11-03 09:01:52 -05:00 
			
		
		
		
	Factor out rt5645 variants Speaker+Headphones shared UCM enable sequences
Move common enable sequences for rt5645 variants and rt5650 UCM configurations into a shared component. The corresponding disable sequences are only two lines each and do not seem worth creating components for. Signed-off-by: Russell Parker <russell.parker7@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
		
							parent
							
								
									e850d8e2e3
								
							
						
					
					
						commit
						d4aa7346b7
					
				
					 8 changed files with 25 additions and 65 deletions
				
			
		| 
						 | 
				
			
			@ -43,12 +43,7 @@ SectionDevice."Speaker" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5645"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' off"
 | 
			
		||||
		cset "name='Headphone Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' on"
 | 
			
		||||
		cset "name='Speaker Channel Switch' on"
 | 
			
		||||
		cset "name='Speaker Playback Volume' 31"
 | 
			
		||||
		<codecs/rt5645/SpeakerEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			@ -75,13 +70,7 @@ SectionDevice."Headphones" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5645"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' off"
 | 
			
		||||
		cset "name='Speaker Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' on"
 | 
			
		||||
		cset "name='Headphone Channel Switch' on"
 | 
			
		||||
		# 25/39 higher values cause crackling on some boards
 | 
			
		||||
		cset "name='Headphone Playback Volume' 25"
 | 
			
		||||
		<codecs/rt5645/HeadphonesEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,12 +43,7 @@ SectionDevice."Speaker" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5645"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' off"
 | 
			
		||||
		cset "name='Headphone Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' on"
 | 
			
		||||
		cset "name='Speaker Channel Switch' on"
 | 
			
		||||
		cset "name='Speaker Playback Volume' 31"
 | 
			
		||||
		<codecs/rt5645/SpeakerEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			@ -75,13 +70,7 @@ SectionDevice."Headphones" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5645"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' off"
 | 
			
		||||
		cset "name='Speaker Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' on"
 | 
			
		||||
		cset "name='Headphone Channel Switch' on"
 | 
			
		||||
		# 25/39 higher values cause crackling on some boards
 | 
			
		||||
		cset "name='Headphone Playback Volume' 25"
 | 
			
		||||
		<codecs/rt5645/HeadphonesEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,12 +47,7 @@ SectionDevice."Speaker" {
 | 
			
		|||
		cset "name='Stereo DAC MIXL DAC R1 Switch' 1"
 | 
			
		||||
		cset "name='Stereo DAC MIXR DAC R1 Switch' 0"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' off"
 | 
			
		||||
		cset "name='Headphone Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' on"
 | 
			
		||||
		cset "name='Speaker Channel Switch' on"
 | 
			
		||||
		cset "name='Speaker Playback Volume' 31"
 | 
			
		||||
		<codecs/rt5645/SpeakerEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			@ -83,13 +78,7 @@ SectionDevice."Headphones" {
 | 
			
		|||
		cset "name='Stereo DAC MIXL DAC R1 Switch' 0"
 | 
			
		||||
		cset "name='Stereo DAC MIXR DAC R1 Switch' 1"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' off"
 | 
			
		||||
		cset "name='Speaker Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' on"
 | 
			
		||||
		cset "name='Headphone Channel Switch' on"
 | 
			
		||||
		# 25/39 higher values cause crackling on some boards
 | 
			
		||||
		cset "name='Headphone Playback Volume' 25"
 | 
			
		||||
		<codecs/rt5645/HeadphonesEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,12 +43,7 @@ SectionDevice."Speaker" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5645"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' off"
 | 
			
		||||
		cset "name='Headphone Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' on"
 | 
			
		||||
		cset "name='Speaker Channel Switch' on"
 | 
			
		||||
		cset "name='Speaker Playback Volume' 31"
 | 
			
		||||
		<codecs/rt5645/SpeakerEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			@ -75,13 +70,7 @@ SectionDevice."Headphones" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5645"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' off"
 | 
			
		||||
		cset "name='Speaker Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' on"
 | 
			
		||||
		cset "name='Headphone Channel Switch' on"
 | 
			
		||||
		# 25/39 higher values cause crackling on some boards
 | 
			
		||||
		cset "name='Headphone Playback Volume' 25"
 | 
			
		||||
		<codecs/rt5645/HeadphonesEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,12 +43,7 @@ SectionDevice."Speaker" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5650"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' off"
 | 
			
		||||
		cset "name='Headphone Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' on"
 | 
			
		||||
		cset "name='Speaker Channel Switch' on"
 | 
			
		||||
		cset "name='Speaker Playback Volume' 31"
 | 
			
		||||
		<codecs/rt5645/SpeakerEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			@ -75,12 +70,7 @@ SectionDevice."Headphones" {
 | 
			
		|||
	EnableSequence [
 | 
			
		||||
		cdev "hw:chtrt5650"
 | 
			
		||||
 | 
			
		||||
		cset "name='Ext Spk Switch' off"
 | 
			
		||||
		cset "name='Speaker Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
		cset "name='Headphone Switch' on"
 | 
			
		||||
		cset "name='Headphone Channel Switch' on"
 | 
			
		||||
		cset "name='Headphone Playback Volume' 31"
 | 
			
		||||
		<codecs/rt5645/HeadphonesEnableSeq.conf>
 | 
			
		||||
	]
 | 
			
		||||
 | 
			
		||||
	DisableSequence [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										7
									
								
								src/conf/ucm/codecs/rt5645/HeadphonesEnableSeq.conf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								src/conf/ucm/codecs/rt5645/HeadphonesEnableSeq.conf
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
cset "name='Ext Spk Switch' off"
 | 
			
		||||
cset "name='Speaker Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
cset "name='Headphone Switch' on"
 | 
			
		||||
cset "name='Headphone Channel Switch' on"
 | 
			
		||||
# 25/39 higher values cause crackling on some boards
 | 
			
		||||
cset "name='Headphone Playback Volume' 25"
 | 
			
		||||
| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
alsaconfigdir = @ALSA_CONFIG_DIR@
 | 
			
		||||
ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645
 | 
			
		||||
ucm_DATA = DisableSeq.conf EnableSeq.conf
 | 
			
		||||
ucm_DATA = DisableSeq.conf EnableSeq.conf HeadphonesEnableSeq.conf \
 | 
			
		||||
		   SpeakerEnableSeq.conf
 | 
			
		||||
EXTRA_DIST = $(ucm_DATA)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										6
									
								
								src/conf/ucm/codecs/rt5645/SpeakerEnableSeq.conf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								src/conf/ucm/codecs/rt5645/SpeakerEnableSeq.conf
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
cset "name='Headphone Switch' off"
 | 
			
		||||
cset "name='Headphone Channel Switch' off"
 | 
			
		||||
 | 
			
		||||
cset "name='Ext Spk Switch' on"
 | 
			
		||||
cset "name='Speaker Channel Switch' on"
 | 
			
		||||
cset "name='Speaker Playback Volume' 31"
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue