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:
db6ae79
)
ASoC: cs42l42: Fallback to headphones for type detect
author
Stefan Binding
<sbinding@opensource.cirrus.com>
Tue, 27 Sep 2022 12:14:40 +0000
(13:14 +0100)
committer
Mark Brown
<broonie@kernel.org>
Tue, 27 Sep 2022 13:00:00 +0000
(14:00 +0100)
After tip sense detects a jack insertion, if automatic
type detection, and manual type detection fails, then
fall back to assume the jack connected belongs to
headphones.
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Link:
https://lore.kernel.org/r/20220927121440.2506632-1-sbinding@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs42l42.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/cs42l42.c
b/sound/soc/codecs/cs42l42.c
index
bdc7e6b
..
2fefbcf
100644
(file)
--- a/
sound/soc/codecs/cs42l42.c
+++ b/
sound/soc/codecs/cs42l42.c
@@
-1199,14
+1199,11
@@
static void cs42l42_manual_hs_type_detect(struct cs42l42_private *cs42l42)
cs42l42->hs_type = CS42L42_PLUG_OMTP;
hs_det_sw = CS42L42_HSDET_SW_TYPE2;
break;
- case CS42L42_HSDET_COMP_TYPE3:
+ /* Detect Type 3 and Type 4 Headsets as Headphones */
+ default:
cs42l42->hs_type = CS42L42_PLUG_HEADPHONE;
hs_det_sw = CS42L42_HSDET_SW_TYPE3;
break;
- default:
- cs42l42->hs_type = CS42L42_PLUG_INVALID;
- hs_det_sw = CS42L42_HSDET_SW_TYPE4;
- break;
}
}