remap mixer controls for rt5640

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

diff --git a/ucm2/SOF/HiFi.conf b/ucm2/SOF/HiFi.conf
index bcd4f3762c772c6313e547c59deda93a4ca1a753..727c8e21ee7aa43018eebdc050099a30b7e980be 100644 (file)
--- a/ucm2/SOF/HiFi.conf
+++ b/ucm2/SOF/HiFi.conf
@@ -4,7 +4,10 @@ If.bytcht_rt5640 {
                Haystack "${CardName}"
                Needle "bytcht rt5640"
        }
-       True.Include.main.File "/bytcr-rt5640/HiFi.conf"
+       True {
+               Include.init.File "/codecs/rt5640/init.conf"
+               Include.main.File "/bytcr-rt5640/HiFi.conf"
+       }
 }
 
 If.bytcht_rt5651 {

diff --git a/ucm2/SOF/SOF.conf b/ucm2/SOF/SOF.conf
index af966ef83011fe03cbfa0f72b79422e6c567d5be..640599c254c08d8095d25303f7572622e00ace98 100644 (file)
--- a/ucm2/SOF/SOF.conf
+++ b/ucm2/SOF/SOF.conf
@@ -1,6 +1,9 @@
-Syntax 3
+Syntax 4
 
 SectionUseCase."HiFi" {
        File "HiFi.conf"
        Comment "Play HiFi quality Music"
 }
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"

diff --git a/ucm2/bytcr-rt5640/bytcr-rt5640.conf b/ucm2/bytcr-rt5640/bytcr-rt5640.conf
index af966ef83011fe03cbfa0f72b79422e6c567d5be..34e91463cc55623dca2f4217c109aaf956fcaa8b 100644 (file)
--- a/ucm2/bytcr-rt5640/bytcr-rt5640.conf
+++ b/ucm2/bytcr-rt5640/bytcr-rt5640.conf
@@ -1,6 +1,10 @@
-Syntax 3
+Syntax 4
 
 SectionUseCase."HiFi" {
        File "HiFi.conf"
        Comment "Play HiFi quality Music"
 }
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"
+Include.codec-init.File "/codecs/rt5640/init.conf"

diff --git a/ucm2/codecs/rt5640/init.conf b/ucm2/codecs/rt5640/init.conf
new file mode 100644 (file)
index 0000000..38baee4
--- /dev/null
+++ b/ucm2/codecs/rt5640/init.conf
@@ -0,0 +1,13 @@
+LibraryConfig.remap.Config {
+
+       ctl.default.remap {
+               "name='ADC Boost Gain'" "name='ADC Boost Capture Volume'"
+               "name='IN1 Boost'" "name='IN1 Boost Capture Volume'"
+               "name='IN2 Boost'" "name='IN2 Boost Capture Volume'"
+               "name='IN3 Boost'" "name='IN3 Boost Capture Volume'"
+               "name='HP Playback Volume'" "name='Headphone Playback Volume'"
+               "name='HP Channel Switch'" "name='Headphone Playback Switch'"
+               "name='Speaker Channel Switch'" "name='Speaker Playback Switch'"
+       }
+
+}