ucm: Update config w.r.t. discovered values in test
This updates the default UCM routes and audio settings as per experimental tests.
Change-Id: Id907c7baeb8c2f90246ea3ec78e6e5d57f0fda0d
diff --git a/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf b/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf
index 85c0fe6..1d8ece7 100644
--- a/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf
+++ b/usr/share/alsa/ucm/edgetpu-audio-card/HiFi.conf
@@ -4,14 +4,14 @@
TQ "HiFi"
# ALSA PCM device for HiFi
- PlaybackPCM "hw:CARD=edgetpuaudiocar,DEV=0"
- CapturePCM "hw:CARD=edgetpuaudiocar,DEV=0"
+ PlaybackPCM "hw:0"
+ CapturePCM "hw:0"
}
EnableSequence [
- cdev "hw:CARD=edgetpuaudiocar,DEV=0"
+ cdev "hw:0"
- cset "name='DAC1 Playback Volume' 80,80"
+ cset "name='DAC1 Playback Volume' 61,61"
# Output Configuration
cset "name='DAC1 MIXL DAC1 Switch' on"
@@ -25,6 +25,7 @@
cset "name='HPOVOL R Switch' on"
cset "name='HPO MIX HPVOL Switch' on"
cset "name='Headphone Channel Switch' off"
+ cset "name='Headphone Playback Volume' 100"
cset "name='SPK MIXL DAC L1 Switch' on"
cset "name='SPK MIXR DAC R1 Switch' on"
@@ -33,10 +34,11 @@
cset "name='SPOL MIX SPKVOL L Switch' on"
cset "name='SPOR MIX SPKVOL R Switch' on"
cset "name='Speaker Channel Switch' off"
+ cset "name='Speaker Playback Volume' 100"
# Input Configuration
- cset "name='ADC Capture Volume' 65,65"
- cset "name='ADC Boost Capture Volume' 1,1"
+ cset "name='ADC Capture Volume' 39,39"
+ cset "name='ADC Boost Capture Volume' 0,0"
cset "name='RECMIXL BST1 Switch' on"
cset "name='RECMIXR BST2 Switch' on"
cset "name='Sto1 ADC MIXL ADC1 Switch' off"
@@ -46,10 +48,13 @@
cset "name='I2S2 Func Switch' off"
cset "name='Stereo1 ADC1 Mux' ADC"
cset "name='Stereo1 ADC2 Mux' DMIC"
+
+ cset "name='ADC Capture Switch' 1"
+ cset "name='IN1 Boost' 6"
]
DisableSequence [
- cdev "hw:CARD=edgetpuaudiocar,DEV=0"
+ cdev "hw:0"
]
}
@@ -58,6 +63,7 @@
Value {
PlaybackChannels "2"
+ CaptureChannels "2"
}
ConflictingDevice [
@@ -65,30 +71,30 @@
]
EnableSequence [
- cdev "hw:CARD=edgetpuaudiocar,DEV=0"
+ cdev "hw:0"
cset "name='Speaker Channel Switch' on"
- cset "name='Sto1 ADC MIXL ADC1 Switch' on"
- cset "name='Sto1 ADC MIXR ADC1 Switch' on"
+ cset "name='Sto1 ADC MIXL ADC2 Switch' on"
+ cset "name='Sto1 ADC MIXR ADC2 Switch' on"
]
DisableSequence [
- cdev "hw:CARD=edgetpuaudiocar,DEV=0"
+ cdev "hw:0"
cset "name='Speaker Channel Switch' off"
- cset "name='Sto1 ADC MIXL ADC1 Switch' off"
- cset "name='Sto1 ADC MIXR ADC1 Switch' off"
+ cset "name='Sto1 ADC MIXL ADC2 Switch' off"
+ cset "name='Sto1 ADC MIXR ADC2 Switch' off"
]
}
-SectionDevice."Headphone".0 {
- Comment "Headphones"
+SectionDevice."Headset".0 {
+ Comment "Headset"
Value {
PlaybackChannels "2"
- CaptureChannels "1"
- JackControl "Headphone Jack"
- JackDev "/dev/input/event0"
+ CaptureChannels "2"
+ JackControl "Headset Jack"
+ JackDev "/dev/input/by-path/platform-sound-rt5645-event"
}
ConflictingDevice [
@@ -96,19 +102,18 @@
]
EnableSequence [
- cdev "hw:CARD=edgetpuaudiocar,DEV=0"
+ cdev "hw:0"
cset "name='Headphone Channel Switch' on"
- cset "name='Sto1 ADC MIXL ADC2 Switch' on"
- cset "name='Sto1 ADC MIXR ADC2 Switch' on"
+ cset "name='Sto1 ADC MIXL ADC1 Switch' on"
+ cset "name='Sto1 ADC MIXR ADC1 Switch' on"
]
DisableSequence [
- cdev "hw:CARD=edgetpuaudiocar,DEV=0"
+ cdev "hw:0"
cset "name='Headphone Channel Switch' off"
- cset "name='Sto1 ADC MIXL ADC2 Switch' off"
- cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+ cset "name='Sto1 ADC MIXL ADC1 Switch' off"
+ cset "name='Sto1 ADC MIXR ADC1 Switch' off"
]
}
-
