ucm2: codecs: wcd938x: use Analog volume for HeadPhones

Current setup used Digital Volume to control Headset Volume which is
pretty saturated after centain gain. Fix the Digital gain at 0dB and use
Analog gain to do the volume control.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/335
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/sc8280xp/HiFi.conf b/ucm2/Qualcomm/sc8280xp/HiFi.conf
index a184e9dc98261fbc89860f43a0e87fd63f4fb661..02c65e50b7ee8069d1f5708467fec80c6f9c54f8 100644 (file)
--- a/ucm2/Qualcomm/sc8280xp/HiFi.conf
+++ b/ucm2/Qualcomm/sc8280xp/HiFi.conf
@@ -44,7 +44,7 @@ SectionDevice."Headphones" {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId},0"
                PlaybackMixer "default:${CardId}"
-               PlaybackMixerElem "HP Digital"
+               PlaybackMixerElem "HP"
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }

diff --git a/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf
index 6c9236deb525dd4fc5d4d1a9c104d64c8bd2a172..f99693800b19d70fa5664b7729652e0bba78995c 100644 (file)
--- a/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf
+++ b/ucm2/codecs/wcd938x/HeadphoneEnableSeq.conf
@@ -3,6 +3,8 @@ EnableSequence [
        cset "name='HPHR_RDAC Switch' 1"
        cset "name='HPHL Switch' 1"
        cset "name='HPHR Switch' 1"
+       cset "name='HPHR_COMP Switch' 0"
+       cset "name='HPHL_COMP Switch' 0"
        cset "name='CLSH Switch' 1"
        cset "name='LO Switch' 1"
 ]

diff --git a/ucm2/codecs/wcd938x/init.conf b/ucm2/codecs/wcd938x/init.conf
index 9bf7fd86b3926ba81c6e7bdb66ca9587b2ee3f7c..3b7c119f982023669aa6680fa000630a74842190 100644 (file)
--- a/ucm2/codecs/wcd938x/init.conf
+++ b/ucm2/codecs/wcd938x/init.conf
@@ -1,8 +1,8 @@
 # WCD938X specific volume control settings
 
 BootSequence [
-       cset "name='RX_RX0 Digital Volume' 80"
-       cset "name='RX_RX1 Digital Volume' 80"
+       cset "name='RX_RX0 Digital Volume' 84"
+       cset "name='RX_RX1 Digital Volume' 84"
        cset "name='ADC2 Volume' 12"
 ]
 
@@ -10,9 +10,9 @@ LibraryConfig.remap.Config {
 
        ctl.default.map {
                # Merge two mono controls into one stereo
-               "name='HP Digital Volume'" {
-                       "name='RX_RX0 Digital Volume'".vindex.0 0
-                       "name='RX_RX1 Digital Volume'".vindex.1 0
+               "name='HP Volume'" {
+                       "name='HPHL Volume'".vindex.0 0
+                       "name='HPHR Volume'".vindex.1 0
                }
        }
 }