33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From b9ee88d9669a088e879d6b6359c8c40fed97b125 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ondrej Jirman <megi@xff.cz>
|
||
|
|
Date: Sat, 20 Aug 2022 20:32:07 +0200
|
||
|
|
Subject: [PATCH 366/464] ASoC: codec: rt5640: Fix hpout restore when lout is
|
||
|
|
enabled
|
||
|
|
|
||
|
|
When line out and heaphones are enabled, rt5640_lout_event will cause
|
||
|
|
headpone state restore to fail, by calling hp_amp_power_on again after
|
||
|
|
rt5640_pmu_depop.
|
||
|
|
|
||
|
|
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
||
|
|
---
|
||
|
|
sound/soc/codecs/rt5640.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
|
||
|
|
index 6821289895fb..b2f8b8064f4f 100644
|
||
|
|
--- a/sound/soc/codecs/rt5640.c
|
||
|
|
+++ b/sound/soc/codecs/rt5640.c
|
||
|
|
@@ -996,7 +996,8 @@ static int rt5640_lout_event(struct snd_soc_dapm_widget *w,
|
||
|
|
|
||
|
|
switch (event) {
|
||
|
|
case SND_SOC_DAPM_POST_PMU:
|
||
|
|
- hp_amp_power_on(component);
|
||
|
|
+ //hp_amp_power_on(component);
|
||
|
|
+ //XXX: ^^ breaks hpout restore
|
||
|
|
snd_soc_component_update_bits(component, RT5640_PWR_ANLG1,
|
||
|
|
RT5640_PWR_LM, RT5640_PWR_LM);
|
||
|
|
snd_soc_component_update_bits(component, RT5640_OUTPUT,
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|