codecs/rt5640: Rename DAPM PIN switches to avoid having 2 Speaker and Headphones...

Now that we rename the mutes from their weird 'Channel Switch' postfix
to the standard 'Playback Switch' postfix we end up having 2 Switches
for the 'Speaker' resp. 'Headphones' volume controls, with 1 of the two
getting ignored by the alsa-lib mixer code because it is duplicate.

This is caused by the bytcr-rt5640 machine driver adding DAPM PIN
Switches which are named 'Headphone Switch' resp. 'Speaker Switch',
rename these to 'Headphone Output Switch' / 'Speaker Output Switch'
so that they get seen as separate controls by the alsa-lib mixer code.

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

diff --git a/ucm2/codecs/rt5640/init.conf b/ucm2/codecs/rt5640/init.conf
index 38baee413daaa6698b3285cc8b668bf1a6c917e0..0756b4abcb1f4540ecb03df38a8860521ef29c88 100644 (file)
--- a/ucm2/codecs/rt5640/init.conf
+++ b/ucm2/codecs/rt5640/init.conf
@@ -5,8 +5,13 @@ LibraryConfig.remap.Config {
                "name='IN1 Boost'" "name='IN1 Boost Capture Volume'"
                "name='IN2 Boost'" "name='IN2 Boost Capture Volume'"
                "name='IN3 Boost'" "name='IN3 Boost Capture Volume'"
+               # Rename the 'Headphone Switch' DAPM PIN switch to avoid it getting
+               # grouped with 'Headphone Playback Volume'
+               "name='Headphone Switch'" "name='Headphone Output Switch'"
                "name='HP Playback Volume'" "name='Headphone Playback Volume'"
                "name='HP Channel Switch'" "name='Headphone Playback Switch'"
+               # Idem for the 'Speaker Switch'
+               "name='Speaker Switch'" "name='Speaker Output Switch'"
                "name='Speaker Channel Switch'" "name='Speaker Playback Switch'"
        }