codecs/rt5640: Add hardware volume-control support

Add hardware volume-control support for the rt5640 codec.

Note this commit does not add support for the (digital) master
ADC/DAC Volume / Mute controls. There are 2 of each, and which
one should be used depends on which AIF is being used.

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

diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
index 1f4316d249712a2200d47544588ebef65217ee42..5535111bfbe7bf6459ee61ac2c609bdb0eb84e65 100644 (file)
--- a/ucm2/codecs/rt5640/HeadPhones.conf
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
@@ -35,5 +35,7 @@ SectionDevice."Headphones" {
                PlaybackPriority 300
                PlaybackPCM "hw:${CardId}"
                JackControl "Headphone Jack"
+               PlaybackMixerElem "HP"
+               PlaybackVolume "HP Playback Volume"
        }
 }

diff --git a/ucm2/codecs/rt5640/HeadsetMic.conf b/ucm2/codecs/rt5640/HeadsetMic.conf
index 829e4e6a938e29f5d2faa1507d8ae8be95ba12f7..8479672aae5f0be0814dcab1c2ee4ca7c44fae98 100644 (file)
--- a/ucm2/codecs/rt5640/HeadsetMic.conf
+++ b/ucm2/codecs/rt5640/HeadsetMic.conf
@@ -41,5 +41,7 @@ SectionDevice."Headset" {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
                JackControl "Headset Mic Jack"
+               CaptureMixerElem "IN2 Boost"
+               CaptureVolume "IN2 Boost"
        }
 }

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index d7c419e629c27e5346694bfbe4b281ae03409f55..a3173886446cc6b02bcaca0379aee18889d2a099 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -32,5 +32,7 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
+               CaptureMixerElem "IN1 Boost"
+               CaptureVolume "IN1 Boost"
        }
 }

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index 3e330e60a4259593bdf9799904a44aa438a7d95c..ef4eaba9bc6676b8c153a93e6d6abc70024d938f 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -32,5 +32,7 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
+               CaptureMixerElem "IN3 Boost"
+               CaptureVolume "IN3 Boost"
        }
 }

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index 654edc3ebd3efd47c1c05024ea667e16eeca293d..3cbeafd7d4ed80c9a617bb7d6ef40f660a3a2f88 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -29,5 +29,7 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
+               PlaybackMixerElem "Speaker"
+               PlaybackVolume "Speaker Playback Volume"
        }
 }

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index 3264cc35110f5323ad10cbb1d2b0070fa36fa045..0924f9c07897c21d0b0f0b1d296e17e25349275d 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -29,5 +29,7 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
+               PlaybackMixerElem "Speaker"
+               PlaybackVolume "Speaker Playback Volume"
        }
 }