From: Hans de Goede Date: Wed, 29 Sep 2021 09:11:41 +0000 (+0200) Subject: codecs/rt5640: Rename DAPM PIN switches to avoid having 2 Speaker and Headphones... X-Git-Tag: v1.2.6~43 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c0e3ef7303af76b164f0995bf0a709a20bc4e9b9;p=alsa-ucm-conf.git codecs/rt5640: Rename DAPM PIN switches to avoid having 2 Speaker and Headphones switches 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 Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/codecs/rt5640/init.conf b/ucm2/codecs/rt5640/init.conf index 38baee4..0756b4a 100644 --- 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'" }