projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4413adc
)
ASoC: rt5682: add NULL handler to set_jack function
author
Jaska Uimonen
<jaska.uimonen@intel.com>
Fri, 27 Sep 2019 20:14:07 +0000
(15:14 -0500)
committer
Mark Brown
<broonie@kernel.org>
Tue, 1 Oct 2019 17:32:35 +0000
(18:32 +0100)
Implement NULL handler in set_jack function to disable
irq's.
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link:
https://lore.kernel.org/r/20190927201408.925-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5682.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/rt5682.c
b/sound/soc/codecs/rt5682.c
index
1ef4707
..
c50b75c
100644
(file)
--- a/
sound/soc/codecs/rt5682.c
+++ b/
sound/soc/codecs/rt5682.c
@@
-995,6
+995,16
@@
static int rt5682_set_jack_detect(struct snd_soc_component *component,
{
struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
+ rt5682->hs_jack = hs_jack;
+
+ if (!hs_jack) {
+ regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2,
+ RT5682_JD1_EN_MASK, RT5682_JD1_DIS);
+ regmap_update_bits(rt5682->regmap, RT5682_RC_CLK_CTRL,
+ RT5682_POW_JDH | RT5682_POW_JDL, 0);
+ return 0;
+ }
+
switch (rt5682->pdata.jd_src) {
case RT5682_JD1:
snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_2,
@@
-1032,8
+1042,6
@@
static int rt5682_set_jack_detect(struct snd_soc_component *component,
break;
}
- rt5682->hs_jack = hs_jack;
-
return 0;
}