| Message ID | 20210718175750.12353-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [alsa-ucm-conf,1/2] bytcr-rt5640: Fix 'Headphone Switch' / 'Headset Mic Switch' no longer getting set | expand |
18.07.2021 20:57, Hans de Goede пишет: > Commit 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") > moved the setting of the 'Headphone Switch' / 'Headset Mic Switch' into > "If.hp" resp "If.hsmic" blocks. But instead of making them part of the > True {} block inside that If, the statements where added add the top-level > of the If {} block where they are no-ops. > > Move them to inside the True blocks so that these Switches again get > properly turned on/off. This fixes the Headphones and Headset-mic no longer > working on bytcr-rt5640 devices. > > Cc: Dmitry Osipenko <digetx@gmail.com> > Fixes: 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > ucm2/bytcr-rt5640/HiFi.conf | 36 ++++++++++++++++++++---------------- > 1 file changed, 20 insertions(+), 16 deletions(-) Hi, I don't see this patch in upstream alsa-ucm, is it still actual?
Hi, On 9/28/21 10:15 PM, Dmitry Osipenko wrote: > 18.07.2021 20:57, Hans de Goede пишет: >> Commit 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") >> moved the setting of the 'Headphone Switch' / 'Headset Mic Switch' into >> "If.hp" resp "If.hsmic" blocks. But instead of making them part of the >> True {} block inside that If, the statements where added add the top-level >> of the If {} block where they are no-ops. >> >> Move them to inside the True blocks so that these Switches again get >> properly turned on/off. This fixes the Headphones and Headset-mic no longer >> working on bytcr-rt5640 devices. >> >> Cc: Dmitry Osipenko <digetx@gmail.com> >> Fixes: 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> ucm2/bytcr-rt5640/HiFi.conf | 36 ++++++++++++++++++++---------------- >> 1 file changed, 20 insertions(+), 16 deletions(-) > > Hi, > > I don't see this patch in upstream alsa-ucm, is it still actual? Yes this patch series is still actual. I also have 3 other patches pending where I was waiting for the mathcing kernel parts to land first. Those have landed now, so I'll send out those now too, including a resend of these 2. Regards, Hans
diff --git a/ucm2/bytcr-rt5640/HiFi.conf b/ucm2/bytcr-rt5640/HiFi.conf index a5b47df..08127e0 100644 --- a/ucm2/bytcr-rt5640/HiFi.conf +++ b/ucm2/bytcr-rt5640/HiFi.conf @@ -100,16 +100,18 @@ If.mono { If.hp { Condition { Type String Empty "" } - True.Include.hs.File "/codecs/rt5640/HeadPhones.conf" + True { + Include.hs.File "/codecs/rt5640/HeadPhones.conf" - SectionDevice."Headphones" { - EnableSequence [ - cset "name='Headphone Switch' on" - ] + SectionDevice."Headphones" { + EnableSequence [ + cset "name='Headphone Switch' on" + ] - DisableSequence [ - cset "name='Headphone Switch' off" - ] + DisableSequence [ + cset "name='Headphone Switch' off" + ] + } } } @@ -178,15 +180,17 @@ If.in3 { If.hsmic { Condition { Type String Empty "" } - True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf" + True { + Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf" - SectionDevice."Headset" { - EnableSequence [ - cset "name='Headset Mic Switch' on" - ] + SectionDevice."Headset" { + EnableSequence [ + cset "name='Headset Mic Switch' on" + ] - DisableSequence [ - cset "name='Headset Mic Switch' off" - ] + DisableSequence [ + cset "name='Headset Mic Switch' off" + ] + } } }
Commit 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") moved the setting of the 'Headphone Switch' / 'Headset Mic Switch' into "If.hp" resp "If.hsmic" blocks. But instead of making them part of the True {} block inside that If, the statements where added add the top-level of the If {} block where they are no-ops. Move them to inside the True blocks so that these Switches again get properly turned on/off. This fixes the Headphones and Headset-mic no longer working on bytcr-rt5640 devices. Cc: Dmitry Osipenko <digetx@gmail.com> Fixes: 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- ucm2/bytcr-rt5640/HiFi.conf | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-)