codecs/es8316: Add hardware volume-control support

Add hardware volume-control support for the es8316 codec.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/es8316/HeadPhones.conf b/ucm2/codecs/es8316/HeadPhones.conf
index b68569a9447bb7a66d78ca83c8214d06cbcb5dca..57bd44865c0a7487638944617e68c12a3a5bcbdb 100644 (file)
--- a/ucm2/codecs/es8316/HeadPhones.conf
+++ b/ucm2/codecs/es8316/HeadPhones.conf
@@ -16,6 +16,8 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
+               PlaybackMixerElem "Headphone Mixer"
+               PlaybackMasterElem "DAC"
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }

diff --git a/ucm2/codecs/es8316/IN1-HeadsetMic.conf b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
index a76b27585a3b14b1237afd60157c8f3ccbc92144..53958bababa42a050488c414526f228dabcb6ee1 100644 (file)
--- a/ucm2/codecs/es8316/IN1-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
@@ -17,6 +17,8 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
+               CaptureMixerElem "ADC PGA Gain"
+               CaptureMasterElem "ADC"
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/es8316/IN1-InternalMic.conf b/ucm2/codecs/es8316/IN1-InternalMic.conf
index ede0a8cdd550d6ee97e53a2fcb154960316eb382..7e7f75fe7c5a949c827f492a3230f68a47a1a39f 100644 (file)
--- a/ucm2/codecs/es8316/IN1-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN1-InternalMic.conf
@@ -17,5 +17,7 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
+               CaptureMixerElem "ADC PGA Gain"
+               CaptureMasterElem "ADC"
        }
 }

diff --git a/ucm2/codecs/es8316/IN2-HeadsetMic.conf b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
index b114c864811c701bf55b0fd98e9370edb9ba3310..9221b24d0566b9e1a4181a00074185cf84f049a2 100644 (file)
--- a/ucm2/codecs/es8316/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
@@ -17,6 +17,8 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
+               CaptureMixerElem "ADC PGA Gain"
+               CaptureMasterElem "ADC"
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/es8316/IN2-InternalMic.conf b/ucm2/codecs/es8316/IN2-InternalMic.conf
index c8fce625dfe6cb3f64405d76cb5663628625c0ad..8b73da4ea9c34f45d69514aef17e44b111ff0eed 100644 (file)
--- a/ucm2/codecs/es8316/IN2-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN2-InternalMic.conf
@@ -17,5 +17,7 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
+               CaptureMixerElem "ADC PGA Gain"
+               CaptureMasterElem "ADC"
        }
 }

diff --git a/ucm2/codecs/es8316/MonoSpeaker.conf b/ucm2/codecs/es8316/MonoSpeaker.conf
index f5f42737f1fdb6352427d77c0eaa916f354dc21d..2d76413d55349c1c47ccd40ab2d618a11c25f74f 100644 (file)
--- a/ucm2/codecs/es8316/MonoSpeaker.conf
+++ b/ucm2/codecs/es8316/MonoSpeaker.conf
@@ -33,5 +33,9 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
+               # The es8316 only has a HP-amp which is muxed to the speaker
+               # or to the headpones output
+               PlaybackMixerElem "Headphone Mixer"
+               PlaybackMasterElem "DAC"
        }
 }

diff --git a/ucm2/codecs/es8316/Speaker.conf b/ucm2/codecs/es8316/Speaker.conf
index 03c21b31ef3933b05ebabe30a3d20930697b3b07..4e977727292a1dcd0f54c61deb7eff78a9b7fd36 100644 (file)
--- a/ucm2/codecs/es8316/Speaker.conf
+++ b/ucm2/codecs/es8316/Speaker.conf
@@ -16,5 +16,9 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
+               # The es8316 only has a HP-amp which is muxed to the speaker
+               # or to the headpones output
+               PlaybackMixerElem "Headphone Mixer"
+               PlaybackMasterElem "DAC"
        }
 }